Merge branch 'fixes-for-v4.9-rc2' of http://git.agner.ch/git/linux-drm-fsl-dcu into...

[cascardo/linux.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index deba266..71b758d 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