mv watchdog tree under drivers

move watchdog tree from drivers/char/watchdog to drivers/watchdog.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

63 files changed, 0 insertions, 25350 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 204d53e506d..69f85185478 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -649,8 +649,6 @@ config HVCS
 
 source "drivers/char/ipmi/Kconfig"
 
-source "drivers/char/watchdog/Kconfig"
-
 config DS1620
 	tristate "NetWinder thermometer support"
 	depends on ARCH_NETWINDER
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
deleted file mode 100644
index 37bddc1802d..00000000000
--- a/drivers/char/watchdog/Kconfig
+++ /dev/null
@@ -1,853 +0,0 @@
-#
-# Watchdog device configuration
-#
-
-menuconfig WATCHDOG
-	bool "Watchdog Timer Support"
-	---help---
-	  If you say Y here (and to one of the following options) and create a
-	  character special file /dev/watchdog with major number 10 and minor
-	  number 130 using mknod ("man mknod"), you will get a watchdog, i.e.:
-	  subsequently opening the file and then failing to write to it for
-	  longer than 1 minute will result in rebooting the machine. This
-	  could be useful for a networked machine that needs to come back
-	  on-line as fast as possible after a lock-up. There's both a watchdog
-	  implementation entirely in software (which can sometimes fail to
-	  reboot the machine) and a driver for hardware watchdog boards, which
-	  are more robust and can also keep track of the temperature inside
-	  your computer. For details, read <file:Documentation/watchdog/watchdog.txt>
-	  in the kernel source.
-
-	  The watchdog is usually used together with the watchdog daemon
-	  which is available from
-	  <ftp://ibiblio.org/pub/Linux/system/daemons/watchdog/>. This daemon can
-	  also monitor NFS connections and can reboot the machine when the process
-	  table is full.
-
-	  If unsure, say N.
-
-if WATCHDOG
-
-config WATCHDOG_NOWAYOUT
-	bool "Disable watchdog shutdown on close"
-	help
-	  The default watchdog behaviour (which you get if you say N here) is
-	  to stop the timer if the process managing it closes the file
-	  /dev/watchdog. It's always remotely possible that this process might
-	  get killed. If you say Y here, the watchdog cannot be stopped once
-	  it has been started.
-
-#
-# General Watchdog drivers
-#
-
-comment "Watchdog Device Drivers"
-
-# Architecture Independent
-
-config SOFT_WATCHDOG
-	tristate "Software watchdog"
-	help
-	  A software monitoring watchdog. This will fail to reboot your system
-	  from some situations that the hardware watchdog will recover
-	  from. Equally it's a lot cheaper to install.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called softdog.
-
-# ALPHA Architecture
-
-# ARM Architecture
-
-config AT91RM9200_WATCHDOG
-	tristate "AT91RM9200 watchdog"
-	depends on ARCH_AT91RM9200
-	help
-	  Watchdog timer embedded into AT91RM9200 chips. This will reboot your
-	  system when the timeout is reached.
-
-config 21285_WATCHDOG
-	tristate "DC21285 watchdog"
-	depends on FOOTBRIDGE
-	help
-	  The Intel Footbridge chip contains a built-in watchdog circuit. Say Y
-	  here if you wish to use this. Alternatively say M to compile the
-	  driver as a module, which will be called wdt285.
-
-	  This driver does not work on all machines. In particular, early CATS
-	  boards have hardware problems that will cause the machine to simply
-	  lock up if the watchdog fires.
-
-	  "If in doubt, leave it out" - say N.
-
-config 977_WATCHDOG
-	tristate "NetWinder WB83C977 watchdog"
-	depends on FOOTBRIDGE && ARCH_NETWINDER
-	help
-	  Say Y here to include support for the WB977 watchdog included in
-	  NetWinder machines. Alternatively say M to compile the driver as
-	  a module, which will be called wdt977.
-
-	  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
-	help
-	  Say Y here if to include support for the watchdog timer
-	  in the Intel IXP4xx network processors. This driver can
-	  be built as a module by choosing M. The module will
-	  be called ixp4xx_wdt.
-
-	  Note: The internal IXP4xx watchdog does a soft CPU reset
-	  which doesn't reset any peripherals. There are circumstances
-	  where the watchdog will fail to reset the board correctly
-	  (e.g., if the boot ROM is in an unreadable state).
-
-	  Say N if you are unsure.
-
-config KS8695_WATCHDOG
-	tristate "KS8695 watchdog"
-	depends on ARCH_KS8695
-	help
-	  Watchdog timer embedded into KS8695 processor. This will reboot your
-	  system when the timeout is reached.
-
-config S3C2410_WATCHDOG
-	tristate "S3C2410 Watchdog"
-	depends on ARCH_S3C2410
-	help
-	  Watchdog timer block in the Samsung S3C2410 chips. This will
-	  reboot the system when the timer expires with the watchdog
-	  enabled.
-
-	  The driver is limited by the speed of the system's PCLK
-	  signal, so with reasonably fast systems (PCLK around 50-66MHz)
-	  then watchdog intervals of over approximately 20seconds are
-	  unavailable.
-
-	  The driver can be built as a module by choosing M, and will
-	  be called s3c2410_wdt
-
-config SA1100_WATCHDOG
-	tristate "SA1100/PXA2xx watchdog"
-	depends on ARCH_SA1100 || ARCH_PXA
-	help
-	  Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
-	  reboot your system when timeout is reached.
-
-	  NOTE: once enabled, this timer cannot be disabled.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called sa1100_wdt.
-
-config MPCORE_WATCHDOG
-	tristate "MPcore watchdog"
-	depends on ARM_MPCORE_PLATFORM && LOCAL_TIMERS
-	help
-	  Watchdog timer embedded into the MPcore system.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called mpcore_wdt.
-
-config EP93XX_WATCHDOG
-	tristate "EP93xx Watchdog"
-	depends on ARCH_EP93XX
-	help
-	  Say Y here if to include support for the watchdog timer
-	  embedded in the Cirrus Logic EP93xx family of devices.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called ep93xx_wdt.
-
-config OMAP_WATCHDOG
-	tristate "OMAP Watchdog"
-	depends on ARCH_OMAP16XX || ARCH_OMAP24XX
-	help
-	  Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to
-	  enable the OMAP1610/OMAP1710 watchdog timer.
-
-config PNX4008_WATCHDOG
-	tristate "PNX4008 Watchdog"
-	depends on ARCH_PNX4008
-	help
-	  Say Y here if to include support for the watchdog timer
-	  in the PNX4008 processor.
-	  This driver can be built as a module by choosing M. The module
-	  will be called pnx4008_wdt.
-
-	  Say N if you are unsure.
-
-config IOP_WATCHDOG
-	tristate "IOP Watchdog"
-	depends on PLAT_IOP
-	select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
-	help
-	  Say Y here if to include support for the watchdog timer
-	  in the Intel IOP3XX & IOP13XX I/O Processors.  This driver can
-	  be built as a module by choosing M. The module will
-	  be called iop_wdt.
-
-	  Note: The IOP13XX watchdog does an Internal Bus Reset which will
-	  affect both cores and the peripherals of the IOP.  The ATU-X
-	  and/or ATUe configuration registers will remain intact, but if
-	  operating as an Root Complex and/or Central Resource, the PCI-X
-	  and/or PCIe busses will also be reset.  THIS IS A VERY BIG HAMMER.
-
-config DAVINCI_WATCHDOG
-	tristate "DaVinci watchdog"
-	depends on ARCH_DAVINCI
-	help
-	  Say Y here if to include support for the watchdog timer
-	  in the DaVinci DM644x/DM646x processors.
-	  To compile this driver as a module, choose M here: the
-	  module will be called davinci_wdt.
-
-	  NOTE: once enabled, this timer cannot be disabled.
-	  Say N if you are unsure.
-
-# ARM26 Architecture
-
-# AVR32 Architecture
-
-config AT32AP700X_WDT
-	tristate "AT32AP700x watchdog"
-	depends on CPU_AT32AP7000
-	help
-	  Watchdog timer embedded into AT32AP700x devices. This will reboot
-	  your system when the timeout is reached.
-
-# BLACKFIN Architecture
-
-config BFIN_WDT
-	tristate "Blackfin On-Chip Watchdog Timer"
-	depends on BLACKFIN
-	---help---
-	  If you say yes here you will get support for the Blackfin On-Chip
-	  Watchdog Timer. If you have one of these processors and wish to
-	  have watchdog support enabled, say Y, otherwise say N.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called bfin_wdt.
-
-# CRIS Architecture
-
-# FRV Architecture
-
-# H8300 Architecture
-
-# X86 (i386 + ia64 + x86_64) Architecture
-
-config ACQUIRE_WDT
-	tristate "Acquire SBC Watchdog Timer"
-	depends on X86
-	---help---
-	  This is the driver for the hardware watchdog on Single Board
-	  Computers produced by Acquire Inc (and others). 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 acquirewdt.
-
-	  Most people will say N.
-
-config ADVANTECH_WDT
-	tristate "Advantech SBC Watchdog Timer"
-	depends on X86
-	help
-	  If you are configuring a Linux kernel for the Advantech single-board
-	  computer, say `Y' here to support its built-in watchdog timer
-	  feature. More information can be found at
-	  <http://www.advantech.com.tw/products/>
-
-config ALIM1535_WDT
-	tristate "ALi M1535 PMU Watchdog Timer"
-	depends on X86 && PCI
-	---help---
-	  This is the driver for the hardware watchdog on the ALi M1535 PMU.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called alim1535_wdt.
-
-	  Most people will say N.
-
-config ALIM7101_WDT
-	tristate "ALi M7101 PMU Computer Watchdog"
-	depends on X86 && PCI
-	help
-	  This is the driver for the hardware watchdog on the ALi M7101 PMU
-	  as used in the x86 Cobalt servers.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called alim7101_wdt.
-
-	  Most people will say N.
-
-config SC520_WDT
-	tristate "AMD Elan SC520 processor Watchdog"
-	depends on X86
-	help
-	  This is the driver for the hardware watchdog built in to the
-	  AMD "Elan" SC520 microcomputer commonly used in embedded systems.
-	  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.
-
-	  You can compile this driver directly into the kernel, or use
-	  it as a module.  The module will be called sc520_wdt.
-
-config EUROTECH_WDT
-	tristate "Eurotech CPU-1220/1410 Watchdog Timer"
-	depends on X86
-	help
-	  Enable support for the watchdog timer on the Eurotech CPU-1220 and
-	  CPU-1410 cards.  These are PC/104 SBCs. Spec sheets and product
-	  information are at <http://www.eurotech.it/>.
-
-config IB700_WDT
-	tristate "IB700 SBC Watchdog Timer"
-	depends on X86
-	---help---
-	  This is the driver for the hardware watchdog on the IB700 Single
-	  Board Computer produced by TMC Technology (www.tmc-uk.com). 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.
-
-	  This driver is like the WDT501 driver but for slightly different hardware.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called ib700wdt.
-
-	  Most people will say N.
-
-config IBMASR
-	tristate "IBM Automatic Server Restart"
-	depends on X86
-	help
-	  This is the driver for the IBM Automatic Server Restart watchdog
-	  timer built-in into some eServer xSeries machines.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called ibmasr.
-
-config WAFER_WDT
-	tristate "ICP Wafer 5823 Single Board Computer Watchdog"
-	depends on X86
-	help
-	  This is a driver for the hardware watchdog on the ICP Wafer 5823
-	  Single Board Computer (and probably other similar models).
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called wafer5823wdt.
-
-config I6300ESB_WDT
-	tristate "Intel 6300ESB Timer/Watchdog"
-	depends on X86 && PCI
-	---help---
-	  Hardware driver for the watchdog timer built into the Intel
-	  6300ESB controller hub.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called i6300esb.
-
-config ITCO_WDT
-	tristate "Intel TCO Timer/Watchdog"
-	depends on (X86 || IA64) && PCI
-	---help---
-	  Hardware driver for the intel TCO timer based watchdog devices.
-	  These drivers are included in the Intel 82801 I/O Controller
-	  Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB
-	  controller hub.
-
-	  The TCO (Total Cost of Ownership) timer is a watchdog timer
-	  that will reboot the machine after its second expiration. The
-	  expiration time can be configured with the "heartbeat" parameter.
-
-	  On some motherboards the driver may fail to reset the chipset's
-	  NO_REBOOT flag which prevents the watchdog from rebooting the
-	  machine. If this is the case you will get a kernel message like
-	  "failed to reset NO_REBOOT flag, reboot disabled by hardware".
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called iTCO_wdt.
-
-config ITCO_VENDOR_SUPPORT
-	bool "Intel TCO Timer/Watchdog Specific Vendor Support"
-	depends on ITCO_WDT
-	---help---
-	  Add vendor specific support to the intel TCO timer based watchdog
-	  devices. At this moment we only have additional support for some
-	  SuperMicro Inc. motherboards.
-
-config SC1200_WDT
-	tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
-	depends on X86
-	help
-	  This is a driver for National Semiconductor PC87307/PC97307 hardware
-	  watchdog cards as found on the SC1200. This watchdog is mainly used
-	  for power management purposes and can be used to power down the device
-	  during inactivity periods (includes interrupt activity monitoring).
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called sc1200wdt.
-
-	  Most people will say N.
-
-config SCx200_WDT
-	tristate "National Semiconductor SCx200 Watchdog"
-	depends on SCx200 && PCI
-	help
-	  Enable the built-in watchdog timer support on the National
-	  Semiconductor SCx200 processors.
-
-	  If compiled as a module, it will be called scx200_wdt.
-
-config PC87413_WDT
-	tristate "NS PC87413 watchdog"
-	depends on 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 X86
-	help
-	  This driver can be used with the watchdog timer found on some
-	  single board computers, namely the 6010 PII based computer.
-	  It may well work with other cards.  It reads port 0x443 to enable
-	  and re-set the watchdog timer, and reads port 0x45 to disable
-	  the watchdog.  If you have a card that behave in similar ways,
-	  you can probably make this driver work with your card as well.
-
-	  You can compile this driver directly into the kernel, or use
-	  it as a module.  The module will be called sbc60xxwdt.
-
-config SBC8360_WDT
-	tristate "SBC8360 Watchdog Timer"
-	depends on X86
-	---help---
-
-	  This is the driver for the hardware watchdog on the SBC8360 Single
-	  Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called sbc8360.ko.
-
-	  Most people will say N.
-
-config CPU5_WDT
-	tristate "SMA CPU5 Watchdog"
-	depends on X86
-	---help---
-	  TBD.
-	  To compile this driver as a module, choose M here: the
-	  module will be called cpu5wdt.
-
-config SMSC37B787_WDT
-	tristate "Winbond SMsC37B787 Watchdog Timer"
-	depends on X86
-	---help---
-	  This is the driver for the hardware watchdog component on the
-	  Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
-	  from Vision Systems and maybe others.
-
-	  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.
-
-	  Usually a userspace daemon will notify the kernel WDT driver that
-	  userspace is still alive, at regular intervals.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called smsc37b787_wdt.
-
-	  Most people will say N.
-
-config W83627HF_WDT
-	tristate "W83627HF Watchdog Timer"
-	depends on X86
-	---help---
-	  This is the driver for the hardware watchdog on the W83627HF chipset
-	  as used in Advantech PC-9578 and Tyan S2721-533 motherboards
-	  (and likely others).  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 w83627hf_wdt.
-
-	  Most people will say N.
-
-config W83697HF_WDT
-	tristate "W83697HF/W83697HG Watchdog Timer"
-	depends on X86
-	---help---
-	  This is the driver for the hardware watchdog on the W83697HF/HG
-	  chipset as used in Dedibox/VIA motherboards (and likely others).
-	  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 w83697hf_wdt.
-
-	  Most people will say N.
-
-config W83877F_WDT
-	tristate "W83877F (EMACS) Watchdog Timer"
-	depends on X86
-	---help---
-	  This is the driver for the hardware watchdog on the W83877F chipset
-	  as used in EMACS PC-104 motherboards (and likely others).  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 w83877f_wdt.
-
-	  Most people will say N.
-
-config W83977F_WDT
-	tristate "W83977F (PCM-5335) Watchdog Timer"
-	depends on X86
-	---help---
-	  This is the driver for the hardware watchdog on the W83977F I/O chip
-	  as used in AAEON's PCM-5335 SBC (and likely others).  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 w83977f_wdt.
-
-config MACHZ_WDT
-	tristate "ZF MachZ Watchdog"
-	depends on X86
-	---help---
-	  If you are using a ZF Mic