aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2010-04-07 19:57:02 +0200
committerWim Van Sebroeck <wim@iguana.be>2010-04-16 12:26:32 +0000
commitaebaec975f30c4db40bb418fe9117bb6b4655b1b (patch)
treef441ed82aac8e5390c717db098393c853fae62ff
parentb1183e064a3f95d27351b2d2c811b50bf4d770a4 (diff)
downloadmrst-s0i3-test-aebaec975f30c4db40bb418fe9117bb6b4655b1b.tar.gz
mrst-s0i3-test-aebaec975f30c4db40bb418fe9117bb6b4655b1b.tar.xz
mrst-s0i3-test-aebaec975f30c4db40bb418fe9117bb6b4655b1b.zip
[WATCHDOG] max63xx driver depends on ioremap()
Correct fix for the "ioremap() causes build failure on S390" should have been a dependancy on HAS_IOMEM. So we add this dependancy also (and leave the driver in the ARM section for now). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3a6aa0ff975..0bf5020d0d3 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -302,7 +302,7 @@ config TS72XX_WATCHDOG
config MAX63XX_WATCHDOG
tristate "Max63xx watchdog"
- depends on ARM
+ depends on ARM && HAS_IOMEM
help
Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.