aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-04-22 07:13:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-04-22 07:13:21 +0000
commitcdf16b5bb0237ad601f4c129b84487af6a4d9b7f (patch)
tree7b3229bee86262d0fc80de2cfe97c83a8dd49556 /target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
parenta0a67ed36661e2252b635e8eb2e2debaa7f2c791 (diff)
downloadupstream-cdf16b5bb0237ad601f4c129b84487af6a4d9b7f.tar.gz
upstream-cdf16b5bb0237ad601f4c129b84487af6a4d9b7f.tar.bz2
upstream-cdf16b5bb0237ad601f4c129b84487af6a4d9b7f.zip
kernel: refresh patches for 2.6.34-rc5 and update md5sum
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21082 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
index d71a11b86a..53492c7b77 100644
--- a/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -840,6 +840,13 @@ config TXX9_WDT
+@@ -857,6 +857,13 @@ config TXX9_WDT
help
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
@@ -16,7 +16,7 @@
# POWERPC Architecture
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
+@@ -113,6 +113,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