aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/Kconfig
diff options
context:
space:
mode:
authorChen Gang <gang.chen.5i5j@gmail.com>2014-10-02 22:01:42 +0800
committerDavid S. Miller <davem@davemloft.net>2014-10-03 15:52:03 -0700
commit9dc8be2816929b13f64e1d3c00d6101939d03df3 (patch)
tree43ddd9953f64cf6458496a8818a3b8d2f185d72d /drivers/net/can/Kconfig
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (diff)
downloadlinux-dev-9dc8be2816929b13f64e1d3c00d6101939d03df3.tar.xz
linux-dev-9dc8be2816929b13f64e1d3c00d6101939d03df3.zip
drivers/net/can/Kconfig: Let CAN_AT91 depend on HAS_IOMEM
CAN_AT91 needs HAS_IOMEM, so depends on it. The related error (with allmodconfig under um): CC [M] drivers/net/can/at91_can.o drivers/net/can/at91_can.c: In function ‘at91_can_probe’: drivers/net/can/at91_can.c:1329:2: error: implicit declaration of function ‘ioremap_nocache’ [-Werror=implicit-function-declaration] addr = ioremap_nocache(res->start, resource_size(res)); ^ drivers/net/can/at91_can.c:1329:7: warning: assignment makes pointer from integer without a cast [enabled by default] addr = ioremap_nocache(res->start, resource_size(res)); ^ drivers/net/can/at91_can.c:1384:2: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration] iounmap(addr); ^ Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/Kconfig')
-rw-r--r--drivers/net/can/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index e78d6b32431d..98d73aab52fe 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -65,7 +65,7 @@ config CAN_LEDS
config CAN_AT91
tristate "Atmel AT91 onchip CAN controller"
- depends on ARCH_AT91 || COMPILE_TEST
+ depends on (ARCH_AT91 || COMPILE_TEST) && HAS_IOMEM
---help---
This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
and AT91SAM9X5 processors.