diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-08-22 15:37:19 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-08-22 15:37:19 +0000 |
commit | 184c6b06f2bb29b693084174908c7a0f1b46e3d2 (patch) | |
tree | eb6e3d897cf739fd60e1728c475b35141a76b0a4 /target/linux/atheros/patches-2.6.26/120-watchdog.patch | |
parent | be1a9ff41dfeed9e00f165e6a661e26ccaa5549c (diff) | |
download | master-31e0f0ae-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.gz master-31e0f0ae-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.bz2 master-31e0f0ae-184c6b06f2bb29b693084174908c7a0f1b46e3d2.zip |
update to 2.6.26.3 and 2.6.25.16
SVN-Revision: 12371
Diffstat (limited to 'target/linux/atheros/patches-2.6.26/120-watchdog.patch')
-rw-r--r-- | target/linux/atheros/patches-2.6.26/120-watchdog.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/atheros/patches-2.6.26/120-watchdog.patch b/target/linux/atheros/patches-2.6.26/120-watchdog.patch index 64ac6871ce..d99b8c7813 100644 --- a/target/linux/atheros/patches-2.6.26/120-watchdog.patch +++ b/target/linux/atheros/patches-2.6.26/120-watchdog.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.26.2/drivers/watchdog/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/watchdog/Kconfig 2008-08-14 16:54:30.000000000 +0200 -+++ linux-2.6.26.2/drivers/watchdog/Kconfig 2008-08-14 16:55:40.000000000 +0200 +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig @@ -683,6 +683,12 @@ help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. @@ -15,10 +13,8 @@ Index: linux-2.6.26.2/drivers/watchdog/Kconfig # PARISC Architecture # POWERPC Architecture -Index: linux-2.6.26.2/drivers/watchdog/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/watchdog/Makefile 2008-08-14 16:55:44.000000000 +0200 -+++ linux-2.6.26.2/drivers/watchdog/Makefile 2008-08-14 16:58:16.000000000 +0200 +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile @@ -97,6 +97,7 @@ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o |