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

[powerpc.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 9b03581..96d6e8c 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -101,9 +101,19 @@ 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
+
+config HAS_DMA
+       boolean
+       depends on !NO_DMA
        default y
 
 endmenu