diff --git a/[refs] b/[refs]
index cab0b739934e..a25cbd13e597 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c3ff74742b481eaf32d010d072b421c97fd8f08
+refs/heads/master: 087fafd15204fb7a5df44b635ed3d3f4348f2d5e
diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig
index 028aba9e72af..ed7ca8ef4f9f 100644
--- a/trunk/lib/Kconfig
+++ b/trunk/lib/Kconfig
@@ -29,6 +29,10 @@ config GENERIC_IOMAP
 	bool
 	select GENERIC_PCI_IOMAP
 
+config GENERIC_IO
+	boolean
+	default n
+
 config CRC_CCITT
 	tristate "CRC-CCITT functions"
 	help
@@ -224,6 +228,7 @@ config BTREE
 config HAS_IOMEM
 	boolean
 	depends on !NO_IOMEM
+	select GENERIC_IO
 	default y
 
 config HAS_IOPORT