diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-02-03 05:15:25 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-02-03 05:15:25 +0000 |
commit | 32f2870131750e44e5a73f6255f077cddca2bca1 (patch) | |
tree | f71b768d8b8f8f9ad14de63f47f80239db43d7df /target/linux/adm5120/patches-2.6.23/310-adm5120_wdt.patch | |
parent | 1250cbc87a75660b7136549d4a1ded1ee1819e53 (diff) | |
download | upstream-32f2870131750e44e5a73f6255f077cddca2bca1.tar.gz upstream-32f2870131750e44e5a73f6255f077cddca2bca1.tar.bz2 upstream-32f2870131750e44e5a73f6255f077cddca2bca1.zip |
refresh .23 kernel paches
SVN-Revision: 10366
Diffstat (limited to 'target/linux/adm5120/patches-2.6.23/310-adm5120_wdt.patch')
-rw-r--r-- | target/linux/adm5120/patches-2.6.23/310-adm5120_wdt.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/adm5120/patches-2.6.23/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.23/310-adm5120_wdt.patch index 55f7b93b46..202e91709f 100644 --- a/target/linux/adm5120/patches-2.6.23/310-adm5120_wdt.patch +++ b/target/linux/adm5120/patches-2.6.23/310-adm5120_wdt.patch @@ -1,7 +1,8 @@ -diff -urN linux-2.6.23.11-old/drivers/char/watchdog/Kconfig linux-2.6.23.11/drivers/char/watchdog/Kconfig ---- linux-2.6.23.11-old/drivers/char/watchdog/Kconfig 2007-12-15 04:50:05.000000000 +0100 -+++ linux-2.6.23.11/drivers/char/watchdog/Kconfig 2007-12-26 20:17:56.000000000 +0100 -@@ -583,6 +583,18 @@ +Index: linux-2.6.23.14/drivers/char/watchdog/Kconfig +=================================================================== +--- linux-2.6.23.14.orig/drivers/char/watchdog/Kconfig ++++ linux-2.6.23.14/drivers/char/watchdog/Kconfig +@@ -583,6 +583,18 @@ config SBC_EPX_C3_WATCHDOG # MIPS Architecture @@ -20,10 +21,11 @@ diff -urN linux-2.6.23.11-old/drivers/char/watchdog/Kconfig linux-2.6.23.11/driv config INDYDOG tristate "Indy/I2 Hardware Watchdog" depends on SGI_IP22 -diff -urN linux-2.6.23.11-old/drivers/char/watchdog/Makefile linux-2.6.23.11/drivers/char/watchdog/Makefile ---- linux-2.6.23.11-old/drivers/char/watchdog/Makefile 2007-12-15 04:50:05.000000000 +0100 -+++ linux-2.6.23.11/drivers/char/watchdog/Makefile 2007-12-26 20:19:24.000000000 +0100 -@@ -87,6 +87,7 @@ +Index: linux-2.6.23.14/drivers/char/watchdog/Makefile +=================================================================== +--- linux-2.6.23.14.orig/drivers/char/watchdog/Makefile ++++ linux-2.6.23.14/drivers/char/watchdog/Makefile +@@ -87,6 +87,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc # M68KNOMMU Architecture # MIPS Architecture |