Merge tag 'v4.9-rc3' into xtensa-for-next

[karo-tx-linux.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index deba2662b9f3d3d2fd13fdc6441bdb912eae3150..71b758dc3a96f9a005a4e9da0ed2e7d21826e513 100644 (file)
--- 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