aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-05-24 21:57:34 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-05-24 21:57:34 +0000
commit46f7d89f9cafe635d8d3abae28a78927ce2fd63d (patch)
treef35fe52cb93cd8b1250b262129a00a082f27e89b /target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch
parent41e092a905d0a75eaddeaf61521a4fd5b951930b (diff)
downloadupstream-46f7d89f9cafe635d8d3abae28a78927ce2fd63d.tar.gz
upstream-46f7d89f9cafe635d8d3abae28a78927ce2fd63d.tar.bz2
upstream-46f7d89f9cafe635d8d3abae28a78927ce2fd63d.zip
Update au1000 for .21, build an SREC initramfs image so that it can be tested directly with yamon
SVN-Revision: 7333
Diffstat (limited to 'target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch')
-rw-r--r--target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch23
1 files changed, 12 insertions, 11 deletions
diff --git a/target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch b/target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch
index 273de9fa6a..276659aded 100644
--- a/target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch
+++ b/target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch
@@ -1,9 +1,9 @@
-diff -urN linux-2.6.16.7/drivers/char/watchdog/Kconfig linux-2.6.16.7.new/drivers/char/watchdog/Kconfig
---- linux-2.6.16.7/drivers/char/watchdog/Kconfig 2006-04-17 23:53:25.000000000 +0200
-+++ linux-2.6.16.7.new/drivers/char/watchdog/Kconfig 2006-04-22 23:23:53.000000000 +0200
-@@ -460,6 +460,14 @@
- timer expired and no process has written to /dev/watchdog during
- that time.
+diff -urN linux-2.6.21.1/drivers/char/watchdog/Kconfig linux-2.6.21.1.new/drivers/char/watchdog/Kconfig
+--- linux-2.6.21.1/drivers/char/watchdog/Kconfig 2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.new/drivers/char/watchdog/Kconfig 2007-05-24 20:05:52.000000000 +0200
+@@ -586,6 +586,14 @@
+ To compile this driver as a module, choose M here: the
+ module will be called rm9k_wdt.
+config MTX1_WATCHDOG
+ tristate "MTX-1 Hardware Watchdog"
@@ -16,13 +16,14 @@ diff -urN linux-2.6.16.7/drivers/char/watchdog/Kconfig linux-2.6.16.7.new/driver
# S390 Architecture
config ZVM_WATCHDOG
-diff -urN linux-2.6.16.7/drivers/char/watchdog/Makefile linux-2.6.16.7.new/drivers/char/watchdog/Makefile
---- linux-2.6.16.7/drivers/char/watchdog/Makefile 2006-04-17 23:53:25.000000000 +0200
-+++ linux-2.6.16.7.new/drivers/char/watchdog/Makefile 2006-04-22 23:21:18.000000000 +0200
-@@ -65,6 +65,7 @@
-
+diff -urN linux-2.6.21.1/drivers/char/watchdog/Makefile linux-2.6.21.1.new/drivers/char/watchdog/Makefile
+--- linux-2.6.21.1/drivers/char/watchdog/Makefile 2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.new/drivers/char/watchdog/Makefile 2007-05-24 20:05:41.000000000 +0200
+@@ -74,6 +74,7 @@
# MIPS Architecture
obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+obj-$(CONFIG_MTX1_WATCHDOG) += mtx-1_watchdog.o
# S390 Architecture
+