summaryrefslogtreecommitdiff
path: root/target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-22 17:19:36 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-22 17:19:36 +0000
commitfb3616ed90169e3ce4f2ff5b12ee5a2e2ea5b7b6 (patch)
tree36af13172be38e491bf935a88f78427d11c0120a /target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch
parent70befa402080c2228c8e575744a38b860d6977fc (diff)
adm5120: make patches apply again and refresh them
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24800 3c298f89-4303-0410-b956-a3cf2f4a3e73
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