aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorThomas Reitmayr <treitmayr@devbase.at>2009-06-01 13:38:34 +0200
committerNicolas Pitre <nico@cam.org>2009-06-08 13:04:59 -0400
commit054bd3f053de54c81b20df11f354476389826e61 (patch)
tree9e2a70dac9ee0619e32d95cd96b378e290167ce6 /drivers/watchdog
parent[ARM] orion5x: Change names of defines for Reset-Out-Mask register (diff)
downloadlinux-dev-054bd3f053de54c81b20df11f354476389826e61.tar.xz
linux-dev-054bd3f053de54c81b20df11f354476389826e61.zip
[ARM] Kirkwood: Add the watchdog timer as a platform device.
The Kirkwood architecture uses the same watchdog device as the Orion architecture. This patch adds orion5x_wdt as a platform device for Kirkwood. Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at> Tested-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 5eb8f21da82e..1e983b1717d3 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -233,10 +233,10 @@ config DAVINCI_WATCHDOG
config ORION5X_WATCHDOG
tristate "Orion5x watchdog"
- depends on ARCH_ORION5X
+ depends on ARCH_ORION5X || ARCH_KIRKWOOD
help
Say Y here if to include support for the watchdog timer
- in the Orion5x ARM SoCs.
+ in the Orion5x and Kirkwood ARM SoCs.
To compile this driver as a module, choose M here: the
module will be called orion5x_wdt.