projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mvebu-watchdog-3.15' of git://git.infradead.org/linux-mvebu into next...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
Kconfig
diff --git
a/drivers/watchdog/Kconfig
b/drivers/watchdog/Kconfig
index 4c4c566c52a35c73e582aa27b35fb7821ae69f8a..f1ff408c4b17144a375c8dbbb2c1d2ab28d83fd5 100644
(file)
--- a/
drivers/watchdog/Kconfig
+++ b/
drivers/watchdog/Kconfig
@@
-223,6
+223,7
@@
config SA1100_WATCHDOG
config DW_WATCHDOG
tristate "Synopsys DesignWare watchdog"
config DW_WATCHDOG
tristate "Synopsys DesignWare watchdog"
+ depends on HAS_IOMEM
help
Say Y here if to include support for the Synopsys DesignWare
watchdog timer found in many chips.
help
Say Y here if to include support for the Synopsys DesignWare
watchdog timer found in many chips.
@@
-291,7
+292,7
@@
config DAVINCI_WATCHDOG
config ORION_WATCHDOG
tristate "Orion watchdog"
config ORION_WATCHDOG
tristate "Orion watchdog"
- depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE
+ depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE
|| ARCH_MVEBU
select WATCHDOG_CORE
help
Say Y here if to include support for the watchdog timer
select WATCHDOG_CORE
help
Say Y here if to include support for the watchdog timer