backport acx100 2.6.24 fixes from SVN
[openwrt/svn-archive/archive.git] / target / linux / adm5120 / patches-2.6.23 / 310-adm5120_wdt.patch
1 Index: linux-2.6.23.14/drivers/char/watchdog/Kconfig
2 ===================================================================
3 --- linux-2.6.23.14.orig/drivers/char/watchdog/Kconfig
4 +++ linux-2.6.23.14/drivers/char/watchdog/Kconfig
5 @@ -583,6 +583,18 @@ config SBC_EPX_C3_WATCHDOG
6
7 # MIPS Architecture
8
9 +config ADM5120_WDT
10 + tristate "Infineon ADM5120 SoC hardware watchdog"
11 + depends on WATCHDOG && MIPS_ADM5120
12 + help
13 + This is a driver for hardware watchdog integrated in Infineon
14 + ADM5120 SoC. This watchdog simply watches your kernel to make sure
15 + it doesn't freeze, and if it does, it reboots your computer after a
16 + certain amount of time.
17 +
18 + To compile this driver as a module, choose M here: the module will be
19 + called adm5120_wdt.
20 +
21 config INDYDOG
22 tristate "Indy/I2 Hardware Watchdog"
23 depends on SGI_IP22
24 Index: linux-2.6.23.14/drivers/char/watchdog/Makefile
25 ===================================================================
26 --- linux-2.6.23.14.orig/drivers/char/watchdog/Makefile
27 +++ linux-2.6.23.14/drivers/char/watchdog/Makefile
28 @@ -87,6 +87,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
29 # M68KNOMMU Architecture
30
31 # MIPS Architecture
32 +obj-$(CONFIG_ADM5120_WDT) += adm5120_wdt.o
33 obj-$(CONFIG_INDYDOG) += indydog.o
34 obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
35 obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o