Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 991c98b..5d4984c 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -342,9 +342,9 @@ config HAS_IOMEM
        select GENERIC_IO
        default y
 
-config HAS_IOPORT
+config HAS_IOPORT_MAP
        boolean
-       depends on HAS_IOMEM && !NO_IOPORT
+       depends on HAS_IOMEM && !NO_IOPORT_MAP
        default y
 
 config HAS_DMA