From: Al Viro <viro@ftp.linux.org.uk>

Remove useless includes of linux/io.h, don't even try to build iomap_copy
on uml (it doesn't have readb() et.al., so...)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 crypto/blkcipher.c |    1 -
 lib/Kconfig        |    5 +++++
 lib/Makefile       |    3 ++-
 lib/ioremap.c      |    1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

diff -puN crypto/blkcipher.c~uml-problems-with-linux-ioh crypto/blkcipher.c
--- a/crypto/blkcipher.c~uml-problems-with-linux-ioh
+++ a/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 -puN lib/Kconfig~uml-problems-with-linux-ioh lib/Kconfig
--- a/lib/Kconfig~uml-problems-with-linux-ioh
+++ a/lib/Kconfig
@@ -101,4 +101,9 @@ config TEXTSEARCH_FSM
 config PLIST
 	boolean
 
+config IOMAP_COPY
+	boolean
+	depends on !UML
+	default y
+
 endmenu
diff -puN lib/Makefile~uml-problems-with-linux-ioh lib/Makefile
--- a/lib/Makefile~uml-problems-with-linux-ioh
+++ a/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 -puN lib/ioremap.c~uml-problems-with-linux-ioh lib/ioremap.c
--- a/lib/ioremap.c~uml-problems-with-linux-ioh
+++ a/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>
 
_