diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-26 06:03:58 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-26 06:03:58 +0300 |
| commit | 01974ea61fc22f086d2987b4b717cbda055f0d03 (patch) | |
| tree | bf5dacb0640bece071cc2b68378bc75a40cfa94a /drivers/watchdog/Kconfig | |
| parent | 7c1c05afddf6bb0a4804cb506f3885248a749aa2 (diff) | |
| parent | ef39a1bf3c4fbdea085c618be424cc88b803f248 (diff) | |
| download | linux-01974ea61fc22f086d2987b4b717cbda055f0d03.tar.xz | |
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] sbc_fitpc2_wdt: fix I/O space access technique.
[WATCHDOG] ixp2000: Fix build failure caused by missing include
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 088f32f29a6e..050ee147592f 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -396,8 +396,8 @@ config SBC_FITPC2_WATCHDOG tristate "Compulab SBC-FITPC2 watchdog" depends on X86 ---help--- - This is the driver for the built-in watchdog timer on the fit-PC2 - Single-board computer made by Compulab. + This is the driver for the built-in watchdog timer on the fit-PC2, + fit-PC2i, CM-iAM single-board computers made by Compulab. It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux. When "Watchdog Timer Value" enabled one can set 31-255 s operational range. |