aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 06:33:18 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 06:33:18 +0000
commit12dce71cd11ca47dee95a6a7c18090892574d7f3 (patch)
tree9ef21b32f930277c9b50012fdec6860cde9789f5 /target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
parent925ad245e090f4d0da3cf902e28b79fdc7206996 (diff)
downloadupstream-12dce71cd11ca47dee95a6a7c18090892574d7f3.tar.gz
upstream-12dce71cd11ca47dee95a6a7c18090892574d7f3.tar.bz2
upstream-12dce71cd11ca47dee95a6a7c18090892574d7f3.zip
refresh kernel patches
SVN-Revision: 11193
Diffstat (limited to 'target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
index 695a455d83..4b4c54a70b 100644
--- a/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25/drivers/watchdog/Kconfig
+Index: linux-2.6.25.4/drivers/watchdog/Kconfig
===================================================================
---- linux-2.6.25.orig/drivers/watchdog/Kconfig
-+++ linux-2.6.25/drivers/watchdog/Kconfig
+--- linux-2.6.25.4.orig/drivers/watchdog/Kconfig
++++ linux-2.6.25.4/drivers/watchdog/Kconfig
@@ -619,6 +619,18 @@ config SBC_EPX_C3_WATCHDOG
# MIPS Architecture
@@ -21,10 +21,10 @@ Index: linux-2.6.25/drivers/watchdog/Kconfig
config INDYDOG
tristate "Indy/I2 Hardware Watchdog"
depends on SGI_HAS_INDYDOG
-Index: linux-2.6.25/drivers/watchdog/Makefile
+Index: linux-2.6.25.4/drivers/watchdog/Makefile
===================================================================
---- linux-2.6.25.orig/drivers/watchdog/Makefile
-+++ linux-2.6.25/drivers/watchdog/Makefile
+--- linux-2.6.25.4.orig/drivers/watchdog/Makefile
++++ linux-2.6.25.4/drivers/watchdog/Makefile
@@ -90,6 +90,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
# M68KNOMMU Architecture