[WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver

[linux-2.6-omap-h63xx.git] / drivers / char / watchdog / Kconfig

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 60198a78974c614277b74fc44a48599a10fbc561..53f5538c0c05e69d056f7cbf8c48c57f1e821074 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -2,9 +2,7 @@
 # Watchdog device configuration
 #
 
 # Watchdog device configuration
 #
 

-menu "Watchdog Cards"
-
-config WATCHDOG
+menuconfig WATCHDOG

        bool "Watchdog Timer Support"
        ---help---
          If you say Y here (and to one of the following options) and create a
        bool "Watchdog Timer Support"
        ---help---
          If you say Y here (and to one of the following options) and create a


@@ -28,9 +26,10 @@ config WATCHDOG
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+if WATCHDOG
+

 config WATCHDOG_NOWAYOUT
        bool "Disable watchdog shutdown on close"
 config WATCHDOG_NOWAYOUT
        bool "Disable watchdog shutdown on close"

-       depends on WATCHDOG

        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
        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


@@ -43,13 +42,11 @@ config WATCHDOG_NOWAYOUT
 #
 
 comment "Watchdog Device Drivers"
 #
 
 comment "Watchdog Device Drivers"

-       depends on WATCHDOG

 
 # Architecture Independent
 
 config SOFT_WATCHDOG
        tristate "Software watchdog"
 
 # Architecture Independent
 
 config SOFT_WATCHDOG
        tristate "Software watchdog"

-       depends on WATCHDOG

        help
          A software monitoring watchdog. This will fail to reboot your system
          from some situations that the hardware watchdog will recover
        help
          A software monitoring watchdog. This will fail to reboot your system
          from some situations that the hardware watchdog will recover


@@ -62,14 +59,14 @@ config SOFT_WATCHDOG
 
 config AT91RM9200_WATCHDOG
        tristate "AT91RM9200 watchdog"
 
 config AT91RM9200_WATCHDOG
        tristate "AT91RM9200 watchdog"

-       depends on WATCHDOG && ARCH_AT91RM9200
+       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"
        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 WATCHDOG && FOOTBRIDGE
+       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
        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


@@ -83,7 +80,7 @@ config 21285_WATCHDOG
 
 config 977_WATCHDOG
        tristate "NetWinder WB83C977 watchdog"
 
 config 977_WATCHDOG
        tristate "NetWinder WB83C977 watchdog"

-       depends on WATCHDOG && FOOTBRIDGE && ARCH_NETWINDER
+       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
        help
          Say Y here to include support for the WB977 watchdog included in
          NetWinder machines. Alternatively say M to compile the driver as


@@ -93,7 +90,7 @@ config 977_WATCHDOG
 
 config IXP2000_WATCHDOG
        tristate "IXP2000 Watchdog"
 
 config IXP2000_WATCHDOG
        tristate "IXP2000 Watchdog"

-       depends on WATCHDOG && ARCH_IXP2000
+       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.
        help
          Say Y here if to include support for the watchdog timer
          in the Intel IXP2000(2400, 2800, 2850) network processors.


@@ -104,7 +101,7 @@ config IXP2000_WATCHDOG
 
 config IXP4XX_WATCHDOG
        tristate "IXP4xx Watchdog"
 
 config IXP4XX_WATCHDOG
        tristate "IXP4xx Watchdog"

-       depends on WATCHDOG && ARCH_IXP4XX
+       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
        help
          Say Y here if to include support for the watchdog timer
          in the Intel IXP4xx network processors. This driver can


@@ -118,9 +115,16 @@ config IXP4XX_WATCHDOG
 
          Say N if you are unsure.
 
 
          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"
 config S3C2410_WATCHDOG
        tristate "S3C2410 Watchdog"

-       depends on WATCHDOG && ARCH_S3C2410
+       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
        help
          Watchdog timer block in the Samsung S3C2410 chips. This will
          reboot the system when the timer expires with the watchdog


@@ -136,7 +140,7 @@ config S3C2410_WATCHDOG
 
 config SA1100_WATCHDOG
        tristate "SA1100/PXA2xx watchdog"
 
 config SA1100_WATCHDOG
        tristate "SA1100/PXA2xx watchdog"

-       depends on WATCHDOG && ( ARCH_SA1100 || ARCH_PXA )
+       depends on ARCH_SA1100 || ARCH_PXA

        help
          Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
          reboot your system when timeout is reached.
        help
          Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
          reboot your system when timeout is reached.


@@ -148,7 +152,7 @@ config SA1100_WATCHDOG
 
 config MPCORE_WATCHDOG
        tristate "MPcore watchdog"
 
 config MPCORE_WATCHDOG
        tristate "MPcore watchdog"

-       depends on WATCHDOG && ARM_MPCORE_PLATFORM && LOCAL_TIMERS
+       depends on ARM_MPCORE_PLATFORM && LOCAL_TIMERS

        help
          Watchdog timer embedded into the MPcore system.
 
        help
          Watchdog timer embedded into the MPcore system.
 


@@ -157,7 +161,7 @@ config MPCORE_WATCHDOG
 
 config EP93XX_WATCHDOG
        tristate "EP93xx Watchdog"
 
 config EP93XX_WATCHDOG
        tristate "EP93xx Watchdog"

-       depends on WATCHDOG && ARCH_EP93XX
+       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.
        help
          Say Y here if to include support for the watchdog timer
          embedded in the Cirrus Logic EP93xx family of devices.


@@ -167,14 +171,14 @@ config EP93XX_WATCHDOG
 
 config OMAP_WATCHDOG
        tristate "OMAP Watchdog"
 
 config OMAP_WATCHDOG
        tristate "OMAP Watchdog"

-       depends on WATCHDOG && (ARCH_OMAP16XX || ARCH_OMAP24XX)
+       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"
        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 WATCHDOG && ARCH_PNX4008
+       depends on ARCH_PNX4008

        help
          Say Y here if to include support for the watchdog timer
          in the PNX4008 processor.
        help
          Say Y here if to include support for the watchdog timer
          in the PNX4008 processor.


@@ -187,7 +191,7 @@ config PNX4008_WATCHDOG
 
 config ACQUIRE_WDT
        tristate "Acquire SBC Watchdog Timer"
 
 config ACQUIRE_WDT
        tristate "Acquire SBC Watchdog Timer"

-       depends on WATCHDOG && X86
+       depends on X86

        ---help---
          This is the driver for the hardware watchdog on Single Board
          Computers produced by Acquire Inc (and others). This watchdog
        ---help---
          This is the driver for the hardware watchdog on Single Board
          Computers produced by Acquire Inc (and others). This watchdog


@@ -201,7 +205,7 @@ config ACQUIRE_WDT
 
 config ADVANTECH_WDT
        tristate "Advantech SBC Watchdog Timer"
 
 config ADVANTECH_WDT
        tristate "Advantech SBC Watchdog Timer"

-       depends on WATCHDOG && X86
+       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
        help
          If you are configuring a Linux kernel for the Advantech single-board
          computer, say `Y' here to support its built-in watchdog timer


@@ -210,7 +214,7 @@ config ADVANTECH_WDT
 
 config ALIM1535_WDT
        tristate "ALi M1535 PMU Watchdog Timer"
 
 config ALIM1535_WDT
        tristate "ALi M1535 PMU Watchdog Timer"

-       depends on WATCHDOG && X86 && PCI
+       depends on X86 && PCI

        ---help---
          This is the driver for the hardware watchdog on the ALi M1535 PMU.
 
        ---help---
          This is the driver for the hardware watchdog on the ALi M1535 PMU.
 


@@ -221,7 +225,7 @@ config ALIM1535_WDT
 
 config ALIM7101_WDT
        tristate "ALi M7101 PMU Computer Watchdog"
 
 config ALIM7101_WDT
        tristate "ALi M7101 PMU Computer Watchdog"

-       depends on WATCHDOG && X86 && PCI
+       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.
        help
          This is the driver for the hardware watchdog on the ALi M7101 PMU
          as used in the x86 Cobalt servers.


@@ -233,7 +237,7 @@ config ALIM7101_WDT
 
 config SC520_WDT
        tristate "AMD Elan SC520 processor Watchdog"
 
 config SC520_WDT
        tristate "AMD Elan SC520 processor Watchdog"

-       depends on WATCHDOG && X86
+       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.
        help
          This is the driver for the hardware watchdog built in to the
          AMD "Elan" SC520 microcomputer commonly used in embedded systems.


@@ -246,7 +250,7 @@ config SC520_WDT
 
 config EUROTECH_WDT
        tristate "Eurotech CPU-1220/1410 Watchdog Timer"
 
 config EUROTECH_WDT
        tristate "Eurotech CPU-1220/1410 Watchdog Timer"

-       depends on WATCHDOG && X86
+       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
        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


@@ -254,7 +258,7 @@ config EUROTECH_WDT
 
 config IB700_WDT
        tristate "IB700 SBC Watchdog Timer"
 
 config IB700_WDT
        tristate "IB700 SBC Watchdog Timer"

-       depends on WATCHDOG && X86
+       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
        ---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


@@ -270,7 +274,7 @@ config IB700_WDT
 
 config IBMASR
        tristate "IBM Automatic Server Restart"
 
 config IBMASR
        tristate "IBM Automatic Server Restart"

-       depends on WATCHDOG && X86
+       depends on X86

        help
          This is the driver for the IBM Automatic Server Restart watchdog
          timer built-in into some eServer xSeries machines.
        help
          This is the driver for the IBM Automatic Server Restart watchdog
          timer built-in into some eServer xSeries machines.


@@ -280,7 +284,7 @@ config IBMASR
 
 config WAFER_WDT
        tristate "ICP Wafer 5823 Single Board Computer Watchdog"
 
 config WAFER_WDT
        tristate "ICP Wafer 5823 Single Board Computer Watchdog"

-       depends on WATCHDOG && X86
+       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).
        help
          This is a driver for the hardware watchdog on the ICP Wafer 5823
          Single Board Computer (and probably other similar models).


@@ -290,7 +294,7 @@ config WAFER_WDT
 
 config I6300ESB_WDT
        tristate "Intel 6300ESB Timer/Watchdog"
 
 config I6300ESB_WDT
        tristate "Intel 6300ESB Timer/Watchdog"

-       depends on WATCHDOG && X86 && PCI
+       depends on X86 && PCI

        ---help---
          Hardware driver for the watchdog timer built into the Intel
          6300ESB controller hub.
        ---help---
          Hardware driver for the watchdog timer built into the Intel
          6300ESB controller hub.


@@ -298,31 +302,9 @@ config I6300ESB_WDT
          To compile this driver as a module, choose M here: the
          module will be called i6300esb.
 
          To compile this driver as a module, choose M here: the
          module will be called i6300esb.
 

-config I8XX_TCO
-       tristate "Intel i8xx TCO Timer/Watchdog"
-       depends on WATCHDOG && (X86 || IA64) && PCI
-       default n
-       ---help---
-         Hardware driver for the TCO timer built into the Intel 82801
-         I/O Controller Hub family.  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 i8xx_tco.
-
-         Note: This driver will be removed in the near future. Please
-         use the Intel TCO Timer/Watchdog driver.
-

 config ITCO_WDT
        tristate "Intel TCO Timer/Watchdog"
 config ITCO_WDT
        tristate "Intel TCO Timer/Watchdog"

-       depends on WATCHDOG && (X86 || IA64) && PCI
+       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
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller


@@ -351,7 +333,7 @@ config ITCO_VENDOR_SUPPORT
 
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
 
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"

-       depends on WATCHDOG && X86
+       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
        help
          This is a driver for National Semiconductor PC87307/PC97307 hardware
          watchdog cards as found on the SC1200. This watchdog is mainly used


@@ -365,7 +347,7 @@ config SC1200_WDT
 
 config SCx200_WDT
        tristate "National Semiconductor SCx200 Watchdog"
 
 config SCx200_WDT
        tristate "National Semiconductor SCx200 Watchdog"

-       depends on WATCHDOG && SCx200 && PCI
+       depends on SCx200 && PCI

        help
          Enable the built-in watchdog timer support on the National
          Semiconductor SCx200 processors.
        help
          Enable the built-in watchdog timer support on the National
          Semiconductor SCx200 processors.


@@ -374,7 +356,7 @@ config SCx200_WDT
 
 config PC87413_WDT
        tristate "NS PC87413 watchdog"
 
 config PC87413_WDT
        tristate "NS PC87413 watchdog"

-       depends on WATCHDOG && X86
+       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
        ---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


@@ -388,7 +370,7 @@ config PC87413_WDT
  
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
  
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"

-       depends on WATCHDOG && X86
+       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.
        help
          This driver can be used with the watchdog timer found on some
          single board computers, namely the 6010 PII based computer.


@@ -402,7 +384,7 @@ config 60XX_WDT
 
 config SBC8360_WDT
        tristate "SBC8360 Watchdog Timer"
 
 config SBC8360_WDT
        tristate "SBC8360 Watchdog Timer"

-       depends on WATCHDOG && X86
+       depends on X86

        ---help---
 
          This is the driver for the hardware watchdog on the SBC8360 Single
        ---help---
 
          This is the driver for the hardware watchdog on the SBC8360 Single


@@ -415,7 +397,7 @@ config SBC8360_WDT
 
 config CPU5_WDT
        tristate "SMA CPU5 Watchdog"
 
 config CPU5_WDT
        tristate "SMA CPU5 Watchdog"

-       depends on WATCHDOG && X86
+       depends on X86

        ---help---
          TBD.
          To compile this driver as a module, choose M here: the
        ---help---
          TBD.
          To compile this driver as a module, choose M here: the


@@ -423,7 +405,7 @@ config CPU5_WDT
 
 config SMSC37B787_WDT
        tristate "Winbond SMsC37B787 Watchdog Timer"
 
 config SMSC37B787_WDT
        tristate "Winbond SMsC37B787 Watchdog Timer"

-       depends on WATCHDOG && X86
+       depends on X86

        ---help---
          This is the driver for the hardware watchdog component on the
          Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
        ---help---
          This is the driver for the hardware watchdog component on the
          Winbond SMsC37B787 chipset as used on the NetRunner Mainboard


@@ -443,7 +425,7 @@ config SMSC37B787_WDT
 
 config W83627HF_WDT
        tristate "W83627HF Watchdog Timer"
 
 config W83627HF_WDT
        tristate "W83627HF Watchdog Timer"

-       depends on WATCHDOG && X86
+       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
        ---help---
          This is the driver for the hardware watchdog on the W83627HF chipset
          as used in Advantech PC-9578 and Tyan S2721-533 motherboards


@@ -458,7 +440,7 @@ config W83627HF_WDT
 
 config W83697HF_WDT
        tristate "W83697HF/W83697HG Watchdog Timer"
 
 config W83697HF_WDT
        tristate "W83697HF/W83697HG Watchdog Timer"

-       depends on WATCHDOG && X86
+       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).
        ---help---
          This is the driver for the hardware watchdog on the W83697HF/HG
          chipset as used in Dedibox/VIA motherboards (and likely others).


@@ -473,7 +455,7 @@ config W83697HF_WDT
 
 config W83877F_WDT
        tristate "W83877F (EMACS) Watchdog Timer"
 
 config W83877F_WDT
        tristate "W83877F (EMACS) Watchdog Timer"

-       depends on WATCHDOG && X86
+       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
        ---help---
          This is the driver for the hardware watchdog on the W83877F chipset
          as used in EMACS PC-104 motherboards (and likely others).  This


@@ -488,7 +470,7 @@ config W83877F_WDT
 
 config W83977F_WDT
        tristate "W83977F (PCM-5335) Watchdog Timer"
 
 config W83977F_WDT
        tristate "W83977F (PCM-5335) Watchdog Timer"

-       depends on WATCHDOG && X86
+       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
        ---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


@@ -501,7 +483,7 @@ config W83977F_WDT
 
 config MACHZ_WDT
        tristate "ZF MachZ Watchdog"
 
 config MACHZ_WDT
        tristate "ZF MachZ Watchdog"

-       depends on WATCHDOG && X86
+       depends on X86

        ---help---
          If you are using a ZF Micro MachZ processor, say Y here, otherwise
          N.  This is the driver for the watchdog timer built-in on that
        ---help---
          If you are using a ZF Micro MachZ processor, say Y here, otherwise
          N.  This is the driver for the watchdog timer built-in on that


@@ -514,7 +496,7 @@ config MACHZ_WDT
 
 config SBC_EPX_C3_WATCHDOG
        tristate "Winsystems SBC EPX-C3 watchdog"
 
 config SBC_EPX_C3_WATCHDOG
        tristate "Winsystems SBC EPX-C3 watchdog"

-       depends on WATCHDOG && X86
+       depends on X86

        ---help---
          This is the driver for the built-in watchdog timer on the EPX-C3
          Single-board computer made by Winsystems, Inc.
        ---help---
          This is the driver for the built-in watchdog timer on the EPX-C3
          Single-board computer made by Winsystems, Inc.


@@ -537,19 +519,19 @@ config SBC_EPX_C3_WATCHDOG
 
 config 8xx_WDT
        tristate "MPC8xx Watchdog Timer"
 
 config 8xx_WDT
        tristate "MPC8xx Watchdog Timer"

-       depends on WATCHDOG && 8xx
+       depends on 8xx

 
 config 83xx_WDT
        tristate "MPC83xx Watchdog Timer"
 
 config 83xx_WDT
        tristate "MPC83xx Watchdog Timer"

-       depends on WATCHDOG && PPC_83xx
+       depends on PPC_83xx

 
 config MV64X60_WDT
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
 
 config MV64X60_WDT
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"

-       depends on WATCHDOG && MV64X60
+       depends on MV64X60

 
 config BOOKE_WDT
        bool "PowerPC Book-E Watchdog Timer"
 
 config BOOKE_WDT
        bool "PowerPC Book-E Watchdog Timer"

-       depends on WATCHDOG && (BOOKE || 4xx)
+       depends on BOOKE || 4xx

        ---help---
          Please see Documentation/watchdog/watchdog-api.txt for
          more information.
        ---help---
          Please see Documentation/watchdog/watchdog-api.txt for
          more information.


@@ -558,7 +540,7 @@ config BOOKE_WDT
 
 config WATCHDOG_RTAS
        tristate "RTAS watchdog"
 
 config WATCHDOG_RTAS
        tristate "RTAS watchdog"

-       depends on WATCHDOG && PPC_RTAS
+       depends on PPC_RTAS

        help
          This driver adds watchdog support for the RTAS watchdog.
 
        help
          This driver adds watchdog support for the RTAS watchdog.
 


@@ -569,16 +551,23 @@ config WATCHDOG_RTAS
 
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
 
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"

-       depends on WATCHDOG && SGI_IP22
+       depends on SGI_IP22

        help
          Hardware driver for the Indy's/I2's watchdog. This is a
          watchdog timer that will reboot the machine after a 60 second
          timer expired and no process has written to /dev/watchdog during
          that time.
 
        help
          Hardware driver for the Indy's/I2's watchdog. This is a
          watchdog timer that will reboot the machine after a 60 second
          timer expired and no process has written to /dev/watchdog during
          that time.
 

+config WDT_MTX1
+       tristate "MTX-1 Hardware Watchdog"
+       depends on MIPS_MTX1
+       help
+         Hardware driver for the MTX-1 boards. This is a watchdog timer that
+         will reboot the machine after a 100 seconds timer expired.
+

 config WDT_RM9K_GPI
        tristate "RM9000/GPI hardware watchdog"
 config WDT_RM9K_GPI
        tristate "RM9000/GPI hardware watchdog"

-       depends on WATCHDOG && CPU_RM9000
+       depends on CPU_RM9000

        help
          Watchdog implementation using the GPI hardware found on
          PMC-Sierra RM9xxx CPUs.
        help
          Watchdog implementation using the GPI hardware found on
          PMC-Sierra RM9xxx CPUs.


@@ -590,7 +579,7 @@ config WDT_RM9K_GPI
 
 config ZVM_WATCHDOG
        tristate "z/VM Watchdog Timer"
 
 config ZVM_WATCHDOG
        tristate "z/VM Watchdog Timer"

-       depends on WATCHDOG && S390
+       depends on S390

        help
          IBM s/390 and zSeries machines running under z/VM 5.1 or later
          provide a virtual watchdog timer to their guest that cause a
        help
          IBM s/390 and zSeries machines running under z/VM 5.1 or later
          provide a virtual watchdog timer to their guest that cause a


@@ -604,7 +593,7 @@ config ZVM_WATCHDOG
 
 config SH_WDT
        tristate "SuperH Watchdog"
 
 config SH_WDT
        tristate "SuperH Watchdog"

-       depends on WATCHDOG && SUPERH
+       depends on SUPERH

        help
          This driver adds watchdog support for the integrated watchdog in the
          SuperH processors. If you have one of these processors and wish
        help
          This driver adds watchdog support for the integrated watchdog in the
          SuperH processors. If you have one of these processors and wish


@@ -631,7 +620,7 @@ config SH_WDT_MMAP
 
 config WATCHDOG_CP1XXX
        tristate "CP1XXX Hardware Watchdog support"
 
 config WATCHDOG_CP1XXX
        tristate "CP1XXX Hardware Watchdog support"

-       depends on WATCHDOG && SPARC64 && PCI
+       depends on SPARC64 && PCI

        ---help---
          This is the driver for the hardware watchdog timers present on
          Sun Microsystems CompactPCI models CP1400 and CP1500.
        ---help---
          This is the driver for the hardware watchdog timers present on
          Sun Microsystems CompactPCI models CP1400 and CP1500.


@@ -645,7 +634,7 @@ config WATCHDOG_CP1XXX
 
 config WATCHDOG_RIO
        tristate "RIO Hardware Watchdog support"
 
 config WATCHDOG_RIO
        tristate "RIO Hardware Watchdog support"

-       depends on WATCHDOG && SPARC64 && PCI
+       depends on SPARC64 && PCI

        help
          Say Y here to support the hardware watchdog capability on Sun RIO
          machines.  The watchdog timeout period is normally one minute but
        help
          Say Y here to support the hardware watchdog capability on Sun RIO
          machines.  The watchdog timeout period is normally one minute but


@@ -656,11 +645,11 @@ config WATCHDOG_RIO
 #
 
 comment "ISA-based Watchdog Cards"
 #
 
 comment "ISA-based Watchdog Cards"

-       depends on WATCHDOG && ISA
+       depends on ISA

 
 config PCWATCHDOG
        tristate "Berkshire Products ISA-PC Watchdog"
 
 config PCWATCHDOG
        tristate "Berkshire Products ISA-PC Watchdog"

-       depends on WATCHDOG && ISA
+       depends on ISA

        ---help---
          This is the driver for the Berkshire Products ISA-PC Watchdog card.
          This card simply watches your kernel to make sure it doesn't freeze,
        ---help---
          This is the driver for the Berkshire Products ISA-PC Watchdog card.
          This card simply watches your kernel to make sure it doesn't freeze,


@@ -676,7 +665,7 @@ config PCWATCHDOG
 
 config MIXCOMWD
        tristate "Mixcom Watchdog"
 
 config MIXCOMWD
        tristate "Mixcom Watchdog"

-       depends on WATCHDOG && ISA
+       depends on ISA

        ---help---
          This is a driver for the Mixcom hardware watchdog cards.  This
          watchdog simply watches your kernel to make sure it doesn't freeze,
        ---help---
          This is a driver for the Mixcom hardware watchdog cards.  This
          watchdog simply watches your kernel to make sure it doesn't freeze,


@@ -690,7 +679,7 @@ config MIXCOMWD
 
 config WDT
        tristate "WDT Watchdog timer"
 
 config WDT
        tristate "WDT Watchdog timer"

-       depends on WATCHDOG && ISA
+       depends on ISA

        ---help---
          If you have a WDT500P or WDT501P watchdog board, say Y here,
          otherwise N. It is not possible to probe for this board, which means
        ---help---
          If you have a WDT500P or WDT501P watchdog board, say Y here,
          otherwise N. It is not possible to probe for this board, which means


@@ -720,11 +709,11 @@ config WDT_501
 #
 
 comment "PCI-based Watchdog Cards"
 #
 
 comment "PCI-based Watchdog Cards"

-       depends on WATCHDOG && PCI
+       depends on PCI

 
 config PCIPCWATCHDOG
        tristate "Berkshire Products PCI-PC Watchdog"
 
 config PCIPCWATCHDOG
        tristate "Berkshire Products PCI-PC Watchdog"

-       depends on WATCHDOG && PCI
+       depends on PCI

        ---help---
          This is the driver for the Berkshire Products PCI-PC Watchdog card.
          This card simply watches your kernel to make sure it doesn't freeze,
        ---help---
          This is the driver for the Berkshire Products PCI-PC Watchdog card.
          This card simply watches your kernel to make sure it doesn't freeze,


@@ -739,7 +728,7 @@ config PCIPCWATCHDOG
 
 config WDTPCI
        tristate "PCI-WDT500/501 Watchdog timer"
 
 config WDTPCI
        tristate "PCI-WDT500/501 Watchdog timer"

-       depends on WATCHDOG && PCI
+       depends on PCI

        ---help---
          If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
 
        ---help---
          If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
 


@@ -766,11 +755,11 @@ config WDT_501_PCI
 #
 
 comment "USB-based Watchdog Cards"
 #
 
 comment "USB-based Watchdog Cards"

-       depends on WATCHDOG && USB
+       depends on USB

 
 config USBPCWATCHDOG
        tristate "Berkshire Products USB-PC Watchdog"
 
 config USBPCWATCHDOG
        tristate "Berkshire Products USB-PC Watchdog"

-       depends on WATCHDOG && USB
+       depends on USB

        ---help---
          This is the driver for the Berkshire Products USB-PC Watchdog card.
          This card simply watches your kernel to make sure it doesn't freeze,
        ---help---
          This is the driver for the Berkshire Products USB-PC Watchdog card.
          This card simply watches your kernel to make sure it doesn't freeze,


@@ -783,4 +772,4 @@ config USBPCWATCHDOG
 
          Most people will say N.
 
 
          Most people will say N.
 

-endmenu
+endif # WATCHDOG