diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-14 16:21:28 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-14 16:21:28 +0000 |
commit | e861730fef124e281a02fdff38511bfbbb8fae99 (patch) | |
tree | a75e1d75a4bb4884492408479f631b524e19ecc0 /target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch | |
parent | 34d8a52831de58408d4081051e1d2007bd83b7e5 (diff) |
[brcm63xx] refresh 2.6.32 patches, fix livebox support (#6821)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20204 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch b/target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch index 1702113d8..0d0a21aeb 100644 --- a/target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch +++ b/target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.32.9/drivers/watchdog/Makefile -=================================================================== ---- linux-2.6.32.9.orig/drivers/watchdog/Makefile 2010-02-23 16:38:51.000000000 +0100 -+++ linux-2.6.32.9/drivers/watchdog/Makefile 2010-02-28 18:13:51.000000000 +0100 -@@ -113,6 +113,7 @@ +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile +@@ -113,6 +113,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o @@ -10,11 +8,9 @@ Index: linux-2.6.32.9/drivers/watchdog/Makefile # PARISC Architecture -Index: linux-2.6.32.9/drivers/watchdog/Kconfig -=================================================================== ---- linux-2.6.32.9.orig/drivers/watchdog/Kconfig 2010-02-23 16:38:51.000000000 +0100 -+++ linux-2.6.32.9/drivers/watchdog/Kconfig 2010-02-28 18:13:51.000000000 +0100 -@@ -850,6 +850,16 @@ +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig +@@ -850,6 +850,16 @@ config TXX9_WDT help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. @@ -31,10 +27,8 @@ Index: linux-2.6.32.9/drivers/watchdog/Kconfig # PARISC Architecture # POWERPC Architecture -Index: linux-2.6.32.9/drivers/watchdog/bcm63xx_wdt.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.32.9/drivers/watchdog/bcm63xx_wdt.c 2010-02-28 18:17:15.000000000 +0100 +--- /dev/null ++++ b/drivers/watchdog/bcm63xx_wdt.c @@ -0,0 +1,334 @@ +/* + * Broadcom BCM63xx SoC watchdog driver |