[WATCHDOG] NS pc87413-wdt Watchdog driver

New watchdog driver for the NS pc87413-wdt Watchdog Timer.

Signed-off-by: Sven Anders <anders@anduras.de>
Signed-off-by: Marcus Junker <junker@anduras.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 0187b11..d3e9998 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -363,6 +363,20 @@ config SCx200_WDT
 
          If compiled as a module, it will be called scx200_wdt.
 
+config PC87413_WDT
+       tristate "NS PC87413 watchdog"
+       depends on WATCHDOG && X86
+       ---help---
+         This is the driver for the hardware watchdog on the PC87413 chipset
+         This watchdog simply watches your kernel to make sure it doesn't
+         freeze, and if it does, it reboots your computer after a certain
+         amount of time.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pc87413_wdt.
+
+         Most people will say N.
+ 
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on WATCHDOG && X86

diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 3644049..e6a9f6f 100644 (file)
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
 obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
+obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
 obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
 obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o

diff --cc drivers/char/watchdog/pc87413_wdt.c
Simple merge