Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 9b03581cdecb3d746186e1c0fa1ab2685cdbcfcc..384249915047f0e28f8f82c10caa6b9795f4fb3b 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -101,9 +101,14 @@ config TEXTSEARCH_FSM
 config PLIST
        boolean
 
-config IOMAP_COPY
+config HAS_IOMEM
        boolean
-       depends on !UML
+       depends on !NO_IOMEM
+       default y
+
+config HAS_IOPORT
+       boolean
+       depends on HAS_IOMEM && !NO_IOPORT
        default y
 
 endmenu