[WATCHDOG] Clean-up Kconfig+Makefile

Clean-up of the watchdog's Kconfig and makefile files.

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

2 files changed, 94 insertions, 46 deletions

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index d9c2eb055f0e..37bddc1802de 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -55,6 +55,8 @@ config SOFT_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called softdog.
 
+# ALPHA Architecture
+
 # ARM Architecture
 
 config AT91RM9200_WATCHDOG
@@ -189,7 +191,7 @@ config PNX4008_WATCHDOG
 
 config IOP_WATCHDOG
         tristate "IOP Watchdog"
-        depends on WATCHDOG && PLAT_IOP
+        depends on PLAT_IOP
         select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
         help
           Say Y here if to include support for the watchdog timer
@@ -205,7 +207,7 @@ config IOP_WATCHDOG
 
 config DAVINCI_WATCHDOG
         tristate "DaVinci watchdog"
-        depends on WATCHDOG && ARCH_DAVINCI
+        depends on ARCH_DAVINCI
         help
           Say Y here if to include support for the watchdog timer
           in the DaVinci DM644x/DM646x processors.
@@ -215,20 +217,22 @@ config DAVINCI_WATCHDOG
           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 WATCHDOG && CPU_AT32AP7000
+        depends on CPU_AT32AP7000
         help
           Watchdog timer embedded into AT32AP700x devices. This will reboot
           your system when the timeout is reached.
 
-# Blackfin Architecture
+# BLACKFIN Architecture
 
 config BFIN_WDT
         tristate "Blackfin On-Chip Watchdog Timer"
-        depends on WATCHDOG && BLACKFIN
+        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
@@ -237,6 +241,12 @@ config BFIN_WDT
           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
@@ -565,16 +575,52 @@ config SBC_EPX_C3_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called sbc_epx_c3.
 
-# PowerPC Architecture
+# M32R Architecture
 
-config 8xx_WDT
-        tristate "MPC8xx Watchdog Timer"
-        depends on 8xx
+# M68K Architecture
+
+# M68KNOMMU Architecture
+
+# MIPS Architecture
+
+config INDYDOG
+        tristate "Indy/I2 Hardware Watchdog"
+        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.
+
+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"
+        depends on CPU_RM9000
+        help
+          Watchdog implementation using the GPI hardware found on
+          PMC-Sierra RM9xxx CPUs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rm9k_wdt.
+
+# PARISC Architecture
+
+# POWERPC Architecture
 
 config MPC5200_WDT
         tristate "MPC5200 Watchdog Timer"
         depends on PPC_MPC52xx
 
+config 8xx_WDT
+        tristate "MPC8xx Watchdog Timer"
+        depends on 8xx
+
 config 83xx_WDT
         tristate "MPC83xx Watchdog Timer"
         depends on PPC_83xx
@@ -601,34 +647,6 @@ config WATCHDOG_RTAS
           To compile this driver as a module, choose M here. The module
           will be called wdrtas.
 
-# MIPS Architecture
-
-config INDYDOG
-        tristate "Indy/I2 Hardware Watchdog"
-        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.
-
-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"
-        depends on CPU_RM9000
-        help
-          Watchdog implementation using the GPI hardware found on
-          PMC-Sierra RM9xxx CPUs.
-
-          To compile this driver as a module, choose M here: the
-          module will be called rm9k_wdt.
-
 # S390 Architecture
 
 config ZVM_WATCHDOG
@@ -643,7 +661,7 @@ config ZVM_WATCHDOG
           To compile this driver as a module, choose M here. The module
           will be called vmwatchdog.
 
-# SUPERH Architecture
+# SUPERH (sh + sh64) Architecture
 
 config SH_WDT
         tristate "SuperH Watchdog"
@@ -670,6 +688,8 @@ config SH_WDT_MMAP
           If you say Y here, user applications will be able to mmap the
           WDT/CPG registers.
 
+# SPARC Architecture
+
 # SPARC64 Architecture
 
 config WATCHDOG_CP1XXX
@@ -694,6 +714,10 @@ config WATCHDOG_RIO
           machines.  The watchdog timeout period is normally one minute but
           can be changed with a boot-time parameter.
 
+# V850 Architecture
+
+# XTENSA Architecture
+
 #
 # ISA-based Watchdog Cards
 #
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index edbf30eecdf6..389f8b14ccc4 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -22,6 +22,8 @@ obj-$(CONFIG_WDTPCI) += wdt_pci.o
 # USB-based Watchdog Cards
 obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
 
+# ALPHA Architecture
+
 # ARM Architecture
 obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
 obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
@@ -38,12 +40,20 @@ obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
 obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
 obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
 
+# ARM26 Architecture
+
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
 
-# Blackfin Architecture
+# BLACKFIN Architecture
 obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
 
+# CRIS Architecture
+
+# FRV Architecture
+
+# H8300 Architecture
+
 # X86 (i386 + ia64 + x86_64) Architecture
 obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
 obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
@@ -70,7 +80,20 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
 obj-$(CONFIG_MACHZ_WDT) += machzwd.o
 obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 
-# PowerPC Architecture
+# M32R Architecture
+
+# M68K Architecture
+
+# M68KNOMMU Architecture
+
+# MIPS Architecture
+obj-$(CONFIG_INDYDOG) += indydog.o
+obj-$(CONFIG_WDT_MTX1)  += mtx-1_wdt.o
+obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+
+# PARISC Architecture
+
+# POWERPC Architecture
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
 obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
 obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o
@@ -80,17 +103,18 @@ obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
 # PPC64 Architecture
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
 
-# MIPS Architecture
-obj-$(CONFIG_INDYDOG) += indydog.o
-obj-$(CONFIG_WDT_MTX1)  += mtx-1_wdt.o
-obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
-
 # S390 Architecture
 
-# SUPERH Architecture
+# SUPERH (sh + sh64) Architecture
 obj-$(CONFIG_SH_WDT) += shwdt.o
 
+# SPARC Architecture
+
 # SPARC64 Architecture
 
+# V850 Architecture
+
+# XTENSA Architecture
+
 # Architecture Independant
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o