diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 16:36:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 16:36:30 -0700 |
| commit | af76bbabbdf5cebea6a3863446f9f74b469c4bdc (patch) | |
| tree | 04f171157bd4c43a7fff841f310cb543ec31966c /drivers/watchdog/Kconfig | |
| parent | 2024da603978882d102a34d47828a205fffb338e (diff) | |
| parent | 06063e26bc3ab62aa7aca874c6ce9e7638673838 (diff) | |
| download | linux-3.10-af76bbabbdf5cebea6a3863446f9f74b469c4bdc.tar.gz linux-3.10-af76bbabbdf5cebea6a3863446f9f74b469c4bdc.tar.bz2 linux-3.10-af76bbabbdf5cebea6a3863446f9f74b469c4bdc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] Documentation/watchdog/src/watchdog-simple.c: improve this code
[WATCHDOG] AR7: watchdog timer
[WATCHDOG] Linux kernel IPC SBC Watchdog Timer driver
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 37bddc1802d..81db48f07ca 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -343,11 +343,12 @@ config IBMASR module will be called ibmasr. config WAFER_WDT - tristate "ICP Wafer 5823 Single Board Computer Watchdog" + tristate "ICP Single Board Computer Watchdog Timer" 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). + This is a driver for the hardware watchdog on the ICP Single + Board Computer. This driver is working on (at least) the following + IPC SBC's: Wafer 5823, Rocky 4783, Rocky 3703 and Rocky 3782. To compile this driver as a module, choose M here: the module will be called wafer5823wdt. @@ -609,6 +610,12 @@ config WDT_RM9K_GPI To compile this driver as a module, choose M here: the module will be called rm9k_wdt. +config AR7_WDT + tristate "TI AR7 Watchdog Timer" + depends on AR7 + help + Hardware driver for the TI AR7 Watchdog Timer. + # PARISC Architecture # POWERPC Architecture |