Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

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

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index b1d3c9c0eff84a1c95a6f3c791e4069f48e12c7c..499b7610eaaf901114d3c7aaab36b53297469aba 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -52,7 +52,7 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 
-config NO_IOPORT
+config NO_IOPORT_MAP
        def_bool y
 
 source "init/Kconfig"