summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorNiklas Cassel <nks@flawful.org>2016-09-22 16:43:17 +0200
committerJesper Nilsson <jespern@axis.com>2016-09-22 16:43:17 +0200
commit2765262f7b005a11d6c7abb3c06ea9fdd09712bd (patch)
tree36de0081d7d864990eb54c872cd8166e8744f4e0 /arch/cris
parentcris: cardbus: fix header include path (diff)
downloadlinux-2765262f7b005a11d6c7abb3c06ea9fdd09712bd.tar.xz
linux-2765262f7b005a11d6c7abb3c06ea9fdd09712bd.zip
cris: fix Kconfig mismatch when building with CONFIG_PCI
I/O port access. Normally there is no I/O space on CRIS but when Cardbus/PCI is enabled the request is passed through the bridge. lib/pci_iomap.c: In function ‘pci_iomap_range’: lib/pci_iomap.c:43:3: error: implicit declaration of function ‘ioport_map’ [-Werror=implicit-function-declaration] return __pci_ioport_map(dev, start, len); ^ Signed-off-by: Niklas Cassel <nks@flawful.org> Signed-off-by: Jesper Nilsson <jespern@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index deba2662b9f3..71b758dc3a96 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -30,7 +30,7 @@ config GENERIC_CALIBRATE_DELAY
default y
config NO_IOPORT_MAP
- def_bool y
+ def_bool y if !PCI
config FORCE_MAX_ZONEORDER
int