From: Niklas Cassel <nks@flawful.org>
Date: Thu, 22 Sep 2016 14:43:17 +0000 (+0200)
Subject: cris: fix Kconfig mismatch when building with CONFIG_PCI
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2765262f7b005a11d6c7abb3c06ea9fdd09712bd;p=linux-beck.git

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>
---

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