Merge remote-tracking branches 'asoc/topic/cygnus', 'asoc/topic/da7213', 'asoc/topic...

[sfrench/cifs-2.6.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index deba2662b9f3d3d2fd13fdc6441bdb912eae3150..54d3f426763bf9abc7185b73e27a68fb910b8dbd 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MMU
        bool
        default y
@@ -30,7 +31,7 @@ config GENERIC_CALIBRATE_DELAY
        default y
 
 config NO_IOPORT_MAP
-       def_bool y
+       def_bool y if !PCI
 
 config FORCE_MAX_ZONEORDER
        int