Merge tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux

[mirror_ubuntu-artful-kernel.git] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2ca8819979b4363e76d30f4fa8c81bb01cc0482c..3a617af60d465196bb894cebdc4042ccd4e4a92f 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -42,7 +42,7 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
        def_bool n
 
-config NO_IOPORT
+config NO_IOPORT_MAP
        def_bool n
 
 config HZ
@@ -257,7 +257,7 @@ config XTENSA_PLATFORM_XT2000
 config XTENSA_PLATFORM_S6105
        bool "S6105"
        select SERIAL_CONSOLE
-       select NO_IOPORT
+       select NO_IOPORT_MAP
 
 config XTENSA_PLATFORM_XTFPGA
        bool "XTFPGA"