aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-04-28 09:28:13 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-04-28 09:28:13 +0000
commit4c78fa04922c0a12613b607a814397ab3071bc68 (patch)
tree7b975fba4e7d055e6c57a5d1e84a6da09c7726e4 /target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
parentee7569f3e5282c1cca047f55ef6bf22183cdce87 (diff)
downloadupstream-4c78fa04922c0a12613b607a814397ab3071bc68.tar.gz
upstream-4c78fa04922c0a12613b607a814397ab3071bc68.tar.bz2
upstream-4c78fa04922c0a12613b607a814397ab3071bc68.zip
refresh kernel patches
SVN-Revision: 21218
Diffstat (limited to 'target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
index b7833c72a7..0c4e8e623c 100644
--- a/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
@@ -1,6 +1,6 @@
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -790,6 +790,18 @@ config RC32434_WDT
+@@ -807,6 +807,18 @@ config RC32434_WDT
To compile this driver as a module, choose M here: the
module will be called rc32434_wdt.
@@ -21,7 +21,7 @@
depends on SGI_HAS_INDYDOG
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
-@@ -113,6 +113,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+@@ -113,6 +113,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o