aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-10-15 19:30:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-10-15 19:30:21 +0000
commitab47d507d2ff2b0846433bc3c77de03c995258f6 (patch)
treeeaa83c336bf1e8a4942376277bb17dab04a0630e /target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch
parent2154d8cde2088958a3c5f221bac76dfb8c9da600 (diff)
downloadupstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.gz
upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.bz2
upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.zip
[kernel] refresh patches against 2.6.27 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch
index 8c93912e0a..b71b99159a 100644
--- a/target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.27/310-adm5120_wdt.patch
@@ -1,6 +1,6 @@
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -653,6 +653,18 @@
+@@ -653,6 +653,18 @@ config RC32434_WDT
To compile this driver as a module, choose M here: the
module will be called rc32434_wdt.
@@ -21,7 +21,7 @@
depends on SGI_HAS_INDYDOG
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
-@@ -102,6 +102,7 @@
+@@ -102,6 +102,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