aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-12-22 17:19:36 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-12-22 17:19:36 +0000
commit22d8dcbf447f54b1a4ff0365c8a5f53736984cf0 (patch)
tree44bc4628235a7deaf2f4a1aefa4d1bb5b828e36d /target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch
parent72ca63488b7a1efd184235509176de9526106cde (diff)
downloadupstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.gz
upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.bz2
upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.zip
adm5120: make patches apply again and refresh them
SVN-Revision: 24800
Diffstat (limited to 'target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch
index 0c4e8e623c..bcc3230ac1 100644
--- a/target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch
@@ -1,6 +1,6 @@
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -807,6 +807,18 @@ config RC32434_WDT
+@@ -825,6 +825,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_PNX833X_WDT) += pnx833x_wdt
+@@ -114,6 +114,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