Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 1e80cb3c77a9cab901ac31dad4b1126c80d09cde..4771fb3f4da4deafdab8b26c76df9c0bec618300 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -351,9 +351,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