Merge git://www.linux-watchdog.org/linux-watchdog

Pull first set of watchdog updates from Wim Van Sebroeck:
 "This pull contains:

   - The removal of ixp2000_wdt
   - The addition of ie6xx_wdt
   - Some documentation fixes
   - Small fixes and improvements

  (Note: Part 2 will contain generic watchdog core changes + conversion
  of some more drivers)"

* git://www.linux-watchdog.org/linux-watchdog:
  Documentation/watchdog: Fix the file descriptor leak when no cmdline arg given
  Documentation/watchdog: close the fd when cmdline arg given
  Documentation/watchdog: Fix a small typo
  watchdog: s3c2410_wdt: Set timeout to actually achieved timeout
  watchdog: wm831x: Convert to gpio_request_one()
  watchdog: via_wdt: depends on PCI
  watchdog: ie6xx_wdt needs io.h
  watchdog: ie6xx_wdt.c: fix printk format warning
  watchdog: Add watchdog driver for Intel Atom E6XX
  watchdog: it87_wdt: Add support for IT8728F watchdog.
  watchdog: i6300esb: don't depend on X86
  watchdog: Use module_pci_driver
  watchdog: sch311x_wdt.c: Remove RESGEN
  watchdog: s3c2410-wdt: Use of_match_ptr().
  watchdog: Device tree support for pnx4008-wdt
  watchdog: ar7_wdt.c: use devm_request_and_ioremap
  watchdog: remove ixp2000 driver
  watchdog: sp5100_tco.c: quiet sparse noise about using plain integer was NULL pointer

1 files changed, 21 insertions, 14 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index edebaf771f5..a18bf6358eb 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -129,17 +129,6 @@ config 977_WATCHDOG
 
           Not sure? It's safe to say N.
 
-config IXP2000_WATCHDOG
-        tristate "IXP2000 Watchdog"
-        depends on ARCH_IXP2000
-        help
-          Say Y here if to include support for the watchdog timer
-          in the Intel IXP2000(2400, 2800, 2850) network processors.
-          This driver can be built as a module by choosing M. The module
-          will be called ixp2000_wdt.
-
-          Say N if you are unsure.
-
 config IXP4XX_WATCHDOG
         tristate "IXP4xx Watchdog"
         depends on ARCH_IXP4XX
@@ -543,7 +532,7 @@ config WAFER_WDT
 
 config I6300ESB_WDT
         tristate "Intel 6300ESB Timer/Watchdog"
-        depends on X86 && PCI
+        depends on PCI
         ---help---
           Hardware driver for the watchdog timer built into the Intel
           6300ESB controller hub.
@@ -551,6 +540,19 @@ config I6300ESB_WDT
           To compile this driver as a module, choose M here: the
           module will be called i6300esb.
 
+config IE6XX_WDT
+        tristate "Intel Atom E6xx Watchdog"
+        depends on X86 && PCI
+        select WATCHDOG_CORE
+        select MFD_CORE
+        select LPC_SCH
+        ---help---
+          Hardware driver for the watchdog timer built into the Intel
+          Atom E6XX (TunnelCreek) processor.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ie6xx_wdt.
+
 config INTEL_SCU_WATCHDOG
         bool "Intel SCU Watchdog for Mobile Platforms"
         depends on X86_MRST
@@ -607,7 +609,12 @@ config IT87_WDT
         depends on X86 && EXPERIMENTAL
         ---help---
           This is the driver for the hardware watchdog on the ITE IT8702,
-          IT8712, IT8716, IT8718, IT8720, IT8721, IT8726 Super I/O chips.
+          IT8712, IT8716, IT8718, IT8720, IT8721, IT8726 and IT8728
+          Super I/O chips.
+
+          If the driver does not work, then make sure that the game port in
+          the BIOS is enabled.
+
           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.
@@ -780,7 +787,7 @@ config SMSC37B787_WDT
 
 config VIA_WDT
         tristate "VIA Watchdog Timer"
-        depends on X86
+        depends on X86 && PCI
         select WATCHDOG_CORE
         ---help---
         This is the driver for the hardware watchdog timer on VIA