summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-02-25 17:50:08 +0100
committerArnd Bergmann <arnd@arndb.de>2014-02-25 17:50:14 +0100
commit1e7bdf82abf210577228d36a098588b49e46b9a9 (patch)
tree4c5f490622a806be8d8677d272e2c7ee4c1c7a2b /drivers/watchdog/Kconfig
parent96f9d40db89fbf59f0f115877ab90d94bb66f503 (diff)
parent59416745bb8cbe32daf805f768418353168b0664 (diff)
downloadop-kernel-dev-1e7bdf82abf210577228d36a098588b49e46b9a9.zip
op-kernel-dev-1e7bdf82abf210577228d36a098588b49e46b9a9.tar.gz
Merge tag 'mvebu-watchdog-3.15' of git://git.infradead.org/linux-mvebu into next/drivers
mvebu watchdog driver changes for v3.15 - orion watchdog - cleanup and extend driver to support Armada 370 and Armada XP Depends: - tags/irqchip-mvebu-fixes-3.14 (already pulled by tglx) - both are based on v3.14-rc1 * tag 'mvebu-watchdog-3.15' of git://git.infradead.org/linux-mvebu: watchdog: orion: Enable the build on ARCH_MVEBU watchdog: orion: Add support for Armada 370 and Armada XP SoC watchdog: orion: Add per-compatible watchdog start implementation watchdog: orion: Add per-compatible clock initialization watchdog: orion: Introduce per-compatible of_device_id data watchdog: orion: Introduce an orion_watchdog device structure watchdog: orion: Remove unneeded BRIDGE_CAUSE clear watchdog: orion: Make RSTOUT register a separate resource watchdog: orion: Handle the interrupt so it's properly acked watchdog: orion: Make sure the watchdog is initially stopped watchdog: orion: Remove unused macros watchdog: orion: Use atomic access for shared registers watchdog: orion: Add clock error handling Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r--drivers/watchdog/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 79d2589..f1ff408 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -292,7 +292,7 @@ config DAVINCI_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
OpenPOWER on IntegriCloud