aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2005-09-03 07:46:56 -0400
committerWim Van Sebroeck <wim@iguana.be>2005-09-03 07:46:56 -0400
commit09c8a9a0c0fe5b3182b6ecfa556fa77a55892c93 (patch)
tree6e58e256da91f7c78221b4f887c0d0479ca3f304 /drivers
parentbe3df0f94d77ba3cff40c14c3e21a753c40ba6f2 (diff)
[WATCHDOG] Kconfig+Makefile-clean
Clean the Kconfig+Makefile according to a sorted list of the drivers of each architecture (and sub-architecture). Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/watchdog/Kconfig43
-rw-r--r--drivers/char/watchdog/Makefile4
2 files changed, 25 insertions, 22 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index b53e2e2b5aee..f4bf6c399010 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -84,6 +84,17 @@ config 977_WATCHDOG
84 84
85 Not sure? It's safe to say N. 85 Not sure? It's safe to say N.
86 86
87config IXP2000_WATCHDOG
88 tristate "IXP2000 Watchdog"
89 depends on WATCHDOG && ARCH_IXP2000
90 help
91 Say Y here if to include support for the watchdog timer
92 in the Intel IXP2000(2400, 2800, 2850) network processors.
93 This driver can be built as a module by choosing M. The module
94 will be called ixp2000_wdt.
95
96 Say N if you are unsure.
97
87config IXP4XX_WATCHDOG 98config IXP4XX_WATCHDOG
88 tristate "IXP4xx Watchdog" 99 tristate "IXP4xx Watchdog"
89 depends on WATCHDOG && ARCH_IXP4XX 100 depends on WATCHDOG && ARCH_IXP4XX
@@ -100,17 +111,6 @@ config IXP4XX_WATCHDOG
100 111
101 Say N if you are unsure. 112 Say N if you are unsure.
102 113
103config IXP2000_WATCHDOG
104 tristate "IXP2000 Watchdog"
105 depends on WATCHDOG && ARCH_IXP2000
106 help
107 Say Y here if to include support for the watchdog timer
108 in the Intel IXP2000(2400, 2800, 2850) network processors.
109 This driver can be built as a module by choosing M. The module
110 will be called ixp2000_wdt.
111
112 Say N if you are unsure.
113
114config S3C2410_WATCHDOG 114config S3C2410_WATCHDOG
115 tristate "S3C2410 Watchdog" 115 tristate "S3C2410 Watchdog"
116 depends on WATCHDOG && ARCH_S3C2410 116 depends on WATCHDOG && ARCH_S3C2410
@@ -346,6 +346,17 @@ config 8xx_WDT
346 tristate "MPC8xx Watchdog Timer" 346 tristate "MPC8xx Watchdog Timer"
347 depends on WATCHDOG && 8xx 347 depends on WATCHDOG && 8xx
348 348
349# PPC64 Architecture
350
351config WATCHDOG_RTAS
352 tristate "RTAS watchdog"
353 depends on WATCHDOG && PPC_RTAS
354 help
355 This driver adds watchdog support for the RTAS watchdog.
356
357 To compile this driver as a module, choose M here. The module
358 will be called wdrtas.
359
349# MIPS Architecture 360# MIPS Architecture
350 361
351config INDYDOG 362config INDYDOG
@@ -414,16 +425,6 @@ config WATCHDOG_RIO
414 machines. The watchdog timeout period is normally one minute but 425 machines. The watchdog timeout period is normally one minute but
415 can be changed with a boot-time parameter. 426 can be changed with a boot-time parameter.
416 427
417# ppc64 RTAS watchdog
418config WATCHDOG_RTAS
419 tristate "RTAS watchdog"
420 depends on WATCHDOG && PPC_RTAS
421 help
422 This driver adds watchdog support for the RTAS watchdog.
423
424 To compile this driver as a module, choose M here. The module
425 will be called wdrtas.
426
427# 428#
428# ISA-based Watchdog Cards 429# ISA-based Watchdog Cards
429# 430#
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index d9b0ed53dae6..6f02f4ce4536 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -25,8 +25,8 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
25# ARM Architecture 25# ARM Architecture
26obj-$(CONFIG_21285_WATCHDOG) += wdt285.o 26obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
27obj-$(CONFIG_977_WATCHDOG) += wdt977.o 27obj-$(CONFIG_977_WATCHDOG) += wdt977.o
28obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
29obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o 28obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
29obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
30obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o 30obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
31obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o 31obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
32 32
@@ -50,6 +50,8 @@ obj-$(CONFIG_MACHZ_WDT) += machzwd.o
50 50
51# PowerPC Architecture 51# PowerPC Architecture
52obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o 52obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
53
54# PPC64 Architecture
53obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o 55obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
54 56
55# MIPS Architecture 57# MIPS Architecture