---

yaml --- r: 154108 b: refs/heads/master c: fec37ab h: refs/heads/master v: v3
git-mirror · Jun 23, 2009 · fbac100 · fbac100
1 parent 4fbda57
commit fbac100
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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