sync for 2.6.23-final
[openwrt/openwrt.git] / target / linux / ar7 / patches-2.6.22 / 140-watchdog.patch
1 diff -ruN linux-2.6.19.2-orig/drivers/char/watchdog/Kconfig linux-2.6.19.2-ar7/drivers/char/watchdog/Kconfig
2 --- linux-2.6.19.2-orig/drivers/char/watchdog/Kconfig 2007-01-10 20:10:37.000000000 +0100
3 +++ linux-2.6.19.2-ar7/drivers/char/watchdog/Kconfig 2007-02-26 12:49:29.000000000 +0100
4 @@ -544,6 +544,12 @@
5
6 # MIPS Architecture
7
8 +config AR7_WDT
9 + tristate "TI AR7 Watchdog Timer"
10 + depends on WATCHDOG && AR7
11 + help
12 + Hardware driver for the TI AR7 Watchdog Timer.
13 +
14 config INDYDOG
15 tristate "Indy/I2 Hardware Watchdog"
16 depends on WATCHDOG && SGI_IP22
17 diff -ruN linux-2.6.19.2-orig/drivers/char/watchdog/Makefile linux-2.6.19.2-ar7/drivers/char/watchdog/Makefile
18 --- linux-2.6.19.2-orig/drivers/char/watchdog/Makefile 2007-01-10 20:10:37.000000000 +0100
19 +++ linux-2.6.19.2-ar7/drivers/char/watchdog/Makefile 2007-02-26 12:46:36.000000000 +0100
20 @@ -71,6 +71,7 @@
21 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
22
23 # MIPS Architecture
24 +obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
25 obj-$(CONFIG_INDYDOG) += indydog.o
26
27 # S390 Architecture