From: Linus Torvalds <torvalds@evo.osdl.org>
Date: Mon, 5 Sep 2005 13:00:45 +0000 (-0700)
Subject: Merge watchdog driver updates
X-Git-Tag: v2.6.14-rc1-omap1~10^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=67d2c36e901403bb97cb79ddb44d702c3284d0ba;p=linux-2.6-omap-h63xx.git

Merge watchdog driver updates

Automated merge from

	master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
---

67d2c36e901403bb97cb79ddb44d702c3284d0ba
diff --cc drivers/char/watchdog/Makefile
index b16dfea2813,6f02f4ce453..cfeac6f1013
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@@ -2,43 -2,67 +2,68 @@@
  # Makefile for the WatchDog device drivers.
  #
  
+ # Only one watchdog can succeed. We probe the ISA/PCI/USB based
+ # watchdog-cards first, then the architecture specific watchdog
+ # drivers and then the architecture independant "softdog" driver.
+ # This means that if your ISA/PCI/USB card isn't detected that
+ # you can fall back to an architecture specific driver and if
+ # that also fails then you can fall back to the software watchdog
+ # to give you some cover.
+ 
+ # ISA-based Watchdog Cards
  obj-$(CONFIG_PCWATCHDOG) += pcwd.o
- obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
- obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
- obj-$(CONFIG_IB700_WDT) += ib700wdt.o
  obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
- obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
- obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
  obj-$(CONFIG_WDT) += wdt.o
+ 
+ # PCI-based Watchdog Cards
+ obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
  obj-$(CONFIG_WDTPCI) += wdt_pci.o
+ 
+ # USB-based Watchdog Cards
+ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
+ 
+ # ARM Architecture
  obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
  obj-$(CONFIG_977_WATCHDOG) += wdt977.o
- obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
- obj-$(CONFIG_MACHZ_WDT) += machzwd.o
- obj-$(CONFIG_SH_WDT) += shwdt.o
+ obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
+ obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
  obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
  obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
- obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
- obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
- obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
- obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
- obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+ 
+ # X86 (i386 + ia64 + x86_64) Architecture
+ obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
+ obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
  obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o
- obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+ obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+ obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
+ obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
+ obj-$(CONFIG_IB700_WDT) += ib700wdt.o
  obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
+ obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
+ obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+ obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
+ obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
  obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
- obj-$(CONFIG_INDYDOG) += indydog.o
- obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
- obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
- obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
- obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
+ obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
+ obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
+ obj-$(CONFIG_MACHZ_WDT) += machzwd.o
+ 
+ # PowerPC Architecture
  obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+ 
+ # PPC64 Architecture
  obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
 +obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
  
- # Only one watchdog can succeed. We probe the hardware watchdog
- # drivers first, then the softdog driver.  This means if your hardware
- # watchdog dies or is 'borrowed' for some reason the software watchdog
- # still gives you some cover.
+ # MIPS Architecture
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ 
+ # S390 Architecture
+ 
+ # SUPERH Architecture
+ obj-$(CONFIG_SH_WDT) += shwdt.o
+ 
+ # SPARC64 Architecture
  
+ # Architecture Independant
  obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o