From fbac1004d2c5c3ff9b908dbb40e867db1bcdded3 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 22 Jun 2009 21:31:20 +0000
Subject: [PATCH] --- yaml --- r: 154108 b: refs/heads/master c:
 fec37ab56f5b86b413f71258f36b181f57180d9c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c70970f68cbe..87d785c3ebfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96f2ebd2e10417da151202c750d8664767a2194b
+refs/heads/master: fec37ab56f5b86b413f71258f36b181f57180d9c
diff --git a/trunk/drivers/net/can/Kconfig b/trunk/drivers/net/can/Kconfig
index d5e18812bf49..33821a81cbf8 100644
--- a/trunk/drivers/net/can/Kconfig
+++ b/trunk/drivers/net/can/Kconfig
@@ -36,7 +36,7 @@ config CAN_CALC_BITTIMING
 	  If unsure, say Y.
 
 config CAN_SJA1000
-	depends on CAN_DEV
+	depends on CAN_DEV && HAS_IOMEM
 	tristate "Philips SJA1000"
 	---help---
 	  Driver for the SJA1000 CAN controllers from Philips or NXP