projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
can
/
Kconfig
diff --git
a/drivers/net/can/Kconfig
b/drivers/net/can/Kconfig
index
d5e1881
..
33821a8
100644
(file)
--- a/
drivers/net/can/Kconfig
+++ b/
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