Commit 180536f8274b76d69a589ab9af4b73d3b780e62f
1 parent
7b4af95332
[WATCHDOG] Kconfig+Makefile-clean2
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>
Showing 2 changed files with 23 additions and 22 deletions Side-by-side Diff
drivers/char/watchdog/Kconfig
| ... | ... | @@ -84,6 +84,17 @@ |
| 84 | 84 | |
| 85 | 85 | Not sure? It's safe to say N. |
| 86 | 86 | |
| 87 | +config 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 | + | |
| 87 | 98 | config IXP4XX_WATCHDOG |
| 88 | 99 | tristate "IXP4xx Watchdog" |
| 89 | 100 | depends on WATCHDOG && ARCH_IXP4XX |
| ... | ... | @@ -100,17 +111,6 @@ |
| 100 | 111 | |
| 101 | 112 | Say N if you are unsure. |
| 102 | 113 | |
| 103 | -config 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 | - | |
| 114 | 114 | config S3C2410_WATCHDOG |
| 115 | 115 | tristate "S3C2410 Watchdog" |
| 116 | 116 | depends on WATCHDOG && ARCH_S3C2410 |
| ... | ... | @@ -353,6 +353,17 @@ |
| 353 | 353 | Please see Documentation/watchdog/watchdog-api.txt for |
| 354 | 354 | more information. |
| 355 | 355 | |
| 356 | +# PPC64 Architecture | |
| 357 | + | |
| 358 | +config WATCHDOG_RTAS | |
| 359 | + tristate "RTAS watchdog" | |
| 360 | + depends on WATCHDOG && PPC_RTAS | |
| 361 | + help | |
| 362 | + This driver adds watchdog support for the RTAS watchdog. | |
| 363 | + | |
| 364 | + To compile this driver as a module, choose M here. The module | |
| 365 | + will be called wdrtas. | |
| 366 | + | |
| 356 | 367 | # MIPS Architecture |
| 357 | 368 | |
| 358 | 369 | config INDYDOG |
| ... | ... | @@ -420,16 +431,6 @@ |
| 420 | 431 | Say Y here to support the hardware watchdog capability on Sun RIO |
| 421 | 432 | machines. The watchdog timeout period is normally one minute but |
| 422 | 433 | can be changed with a boot-time parameter. |
| 423 | - | |
| 424 | -# ppc64 RTAS watchdog | |
| 425 | -config WATCHDOG_RTAS | |
| 426 | - tristate "RTAS watchdog" | |
| 427 | - depends on WATCHDOG && PPC_RTAS | |
| 428 | - help | |
| 429 | - This driver adds watchdog support for the RTAS watchdog. | |
| 430 | - | |
| 431 | - To compile this driver as a module, choose M here. The module | |
| 432 | - will be called wdrtas. | |
| 433 | 434 | |
| 434 | 435 | # |
| 435 | 436 | # ISA-based Watchdog Cards |
drivers/char/watchdog/Makefile
| ... | ... | @@ -50,10 +50,10 @@ |
| 50 | 50 | |
| 51 | 51 | # PowerPC Architecture |
| 52 | 52 | obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o |
| 53 | +obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o | |
| 53 | 54 | |
| 54 | 55 | # PPC64 Architecture |
| 55 | 56 | obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o |
| 56 | -obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o | |
| 57 | 57 | |
| 58 | 58 | # MIPS Architecture |
| 59 | 59 | obj-$(CONFIG_INDYDOG) += indydog.o |