initial merge of danube wdt code

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9727 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 22 insertions, 10 deletions

diff --git a/target/linux/danube/patches/110-drivers.patch b/target/linux/danube/patches/110-drivers.patch
index 031ece6caa..3004672dc2 100644
--- a/target/linux/danube/patches/110-drivers.patch
+++ b/target/linux/danube/patches/110-drivers.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.23/drivers/serial/Kconfig
 ===================================================================
---- linux-2.6.23.orig/drivers/serial/Kconfig	2007-11-04 17:29:22.000000000 +0100
-+++ linux-2.6.23/drivers/serial/Kconfig	2007-11-04 17:29:25.000000000 +0100
+--- linux-2.6.23.orig/drivers/serial/Kconfig	2007-12-10 21:38:39.000000000 +0100
++++ linux-2.6.23/drivers/serial/Kconfig	2007-12-10 21:38:42.000000000 +0100
 @@ -1259,4 +1259,10 @@
  	  Currently, only 8250 compatible ports are supported, but
  	  others can easily be added.
@@ -15,8 +15,8 @@ Index: linux-2.6.23/drivers/serial/Kconfig
  endmenu
 Index: linux-2.6.23/drivers/serial/Makefile
 ===================================================================
---- linux-2.6.23.orig/drivers/serial/Makefile	2007-11-04 17:29:22.000000000 +0100
-+++ linux-2.6.23/drivers/serial/Makefile	2007-11-04 17:29:25.000000000 +0100
+--- linux-2.6.23.orig/drivers/serial/Makefile	2007-12-10 21:38:39.000000000 +0100
++++ linux-2.6.23/drivers/serial/Makefile	2007-12-10 21:38:42.000000000 +0100
 @@ -64,3 +64,4 @@
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
@@ -24,8 +24,8 @@ Index: linux-2.6.23/drivers/serial/Makefile
 +obj-$(CONFIG_SERIAL_DANUBE) += danube_asc.o
 Index: linux-2.6.23/drivers/mtd/maps/Makefile
 ===================================================================
---- linux-2.6.23.orig/drivers/mtd/maps/Makefile	2007-11-04 17:29:22.000000000 +0100
-+++ linux-2.6.23/drivers/mtd/maps/Makefile	2007-11-04 17:29:25.000000000 +0100
+--- linux-2.6.23.orig/drivers/mtd/maps/Makefile	2007-12-10 21:38:39.000000000 +0100
++++ linux-2.6.23/drivers/mtd/maps/Makefile	2007-12-10 21:38:42.000000000 +0100
 @@ -71,3 +71,4 @@
  obj-$(CONFIG_MTD_OMAP_NOR)	+= omap_nor.o
  obj-$(CONFIG_MTD_MTX1)		+= mtx-1_flash.o
@@ -33,8 +33,8 @@ Index: linux-2.6.23/drivers/mtd/maps/Makefile
 +obj-$(CONFIG_MTD_DANUBE)	+= danube.o
 Index: linux-2.6.23/drivers/net/Kconfig
 ===================================================================
---- linux-2.6.23.orig/drivers/net/Kconfig	2007-11-04 17:29:25.000000000 +0100
-+++ linux-2.6.23/drivers/net/Kconfig	2007-11-11 16:48:24.000000000 +0100
+--- linux-2.6.23.orig/drivers/net/Kconfig	2007-12-10 21:38:42.000000000 +0100
++++ linux-2.6.23/drivers/net/Kconfig	2007-12-10 21:38:42.000000000 +0100
 @@ -339,6 +339,18 @@
  
  source "drivers/net/arm/Kconfig"
@@ -56,8 +56,8 @@ Index: linux-2.6.23/drivers/net/Kconfig
  	depends on ARM || MIPS
 Index: linux-2.6.23/drivers/net/Makefile
 ===================================================================
---- linux-2.6.23.orig/drivers/net/Makefile	2007-11-04 17:29:25.000000000 +0100
-+++ linux-2.6.23/drivers/net/Makefile	2007-11-11 16:47:14.000000000 +0100
+--- linux-2.6.23.orig/drivers/net/Makefile	2007-12-10 21:38:42.000000000 +0100
++++ linux-2.6.23/drivers/net/Makefile	2007-12-10 21:38:42.000000000 +0100
 @@ -208,6 +208,7 @@
  obj-$(CONFIG_FEC_8XX) += fec_8xx/
  obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
@@ -66,3 +66,15 @@ Index: linux-2.6.23/drivers/net/Makefile
  
  obj-$(CONFIG_MACB) += macb.o
  
+Index: linux-2.6.23/drivers/char/watchdog/Makefile
+===================================================================
+--- linux-2.6.23.orig/drivers/char/watchdog/Makefile	2007-12-10 21:41:51.000000000 +0100
++++ linux-2.6.23/drivers/char/watchdog/Makefile	2007-12-10 21:42:30.000000000 +0100
+@@ -90,6 +90,7 @@
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_WDT_MTX1)	+= mtx-1_wdt.o
+ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
++obj-$(CONFIG_DANUBE_WDT) += danube_wdt.o
+ 
+ # PARISC Architecture
+