diff --git a/[refs] b/[refs]
index 468f1e143c54..c82ae9148ea1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62fb2ba3d870305e246c6cb317609c1dc2c9dd0b
+refs/heads/master: ee36c2bf8edb1c3e3855a928b348d29c6359093d
diff --git a/trunk/crypto/blkcipher.c b/trunk/crypto/blkcipher.c
index 034c939bf91a..6e93004f2181 100644
--- a/trunk/crypto/blkcipher.c
+++ b/trunk/crypto/blkcipher.c
@@ -17,7 +17,6 @@
 #include <linux/crypto.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/scatterlist.h>
 #include <linux/seq_file.h>
diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig
index 47b172df3e31..9b03581cdecb 100644
--- a/trunk/lib/Kconfig
+++ b/trunk/lib/Kconfig
@@ -101,4 +101,9 @@ config TEXTSEARCH_FSM
 config PLIST
 	boolean
 
+config IOMAP_COPY
+	boolean
+	depends on !UML
+	default y
+
 endmenu
diff --git a/trunk/lib/Makefile b/trunk/lib/Makefile
index c9ec8f11e833..77b4bad7d441 100644
--- a/trunk/lib/Makefile
+++ b/trunk/lib/Makefile
@@ -12,13 +12,14 @@ lib-$(CONFIG_SMP) += cpumask.o
 
 lib-y	+= kobject.o kref.o kobject_uevent.o klist.o
 
-obj-y += sort.o parser.o halfmd4.o iomap_copy.o debug_locks.o random32.o
+obj-y += sort.o parser.o halfmd4.o debug_locks.o random32.o
 
 ifeq ($(CONFIG_DEBUG_KOBJECT),y)
 CFLAGS_kobject.o += -DDEBUG
 CFLAGS_kobject_uevent.o += -DDEBUG
 endif
 
+obj-$(CONFIG_IOMAP_COPY) += iomap_copy.o
 obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
 lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
diff --git a/trunk/lib/ioremap.c b/trunk/lib/ioremap.c
index 99fa277f9f7b..a9e4415b02dc 100644
--- a/trunk/lib/ioremap.c
+++ b/trunk/lib/ioremap.c
@@ -5,7 +5,6 @@
  *
  * (C) Copyright 1995 1996 Linus Torvalds
  */
-#include <linux/io.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>