diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:35:28 (GMT) |
| commit | 4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch) | |
| tree | 1026418471fe10c5b9f2fdff8a6b49bf070938fc /drivers/watchdog/Kconfig | |
| parent | 5130213721d01b6632c255d4295a8102cbb58379 (diff) | |
| parent | f00c0afdfa625165a609513bc74164d56752ec3e (diff) | |
| download | linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.xz | |
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b54f26c..b4b3e25 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -746,7 +746,7 @@ config ALIM7101_WDT config EBC_C384_WDT tristate "WinSystems EBC-C384 Watchdog Timer" - depends on X86 && ISA + depends on X86 && ISA_BUS_API select WATCHDOG_CORE help Enables watchdog timer support for the watchdog timer on the |