From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 7 Apr 2010 17:57:02 +0000 (+0200)
Subject: [WATCHDOG] max63xx driver depends on ioremap()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=aebaec975f30c4db40bb418fe9117bb6b4655b1b;p=deliverable%2Flinux.git

[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>
---

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3a6aa0ff975a..0bf5020d0d32 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.