From 35d52ea2ef195ceffe43722ad38e1ecc0ed07d29 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 7 Apr 2010 19:57:02 +0200
Subject: [PATCH] --- yaml --- r: 189978 b: refs/heads/master c:
 aebaec975f30c4db40bb418fe9117bb6b4655b1b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/watchdog/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 83f293396d3e..9b20e929d02c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1183e064a3f95d27351b2d2c811b50bf4d770a4
+refs/heads/master: aebaec975f30c4db40bb418fe9117bb6b4655b1b
diff --git a/trunk/drivers/watchdog/Kconfig b/trunk/drivers/watchdog/Kconfig
index 3a6aa0ff975a..0bf5020d0d32 100644
--- a/trunk/drivers/watchdog/Kconfig
+++ b/trunk/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.