diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-13 00:35:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:05:52 -0800 |
| commit | ee36c2bf8edb1c3e3855a928b348d29c6359093d (patch) | |
| tree | 1f536eaa3bccfce90a919d871f819f41d7e70988 | |
| parent | 62fb2ba3d870305e246c6cb317609c1dc2c9dd0b (diff) | |
| download | op-kernel-dev-ee36c2bf8edb1c3e3855a928b348d29c6359093d.zip op-kernel-dev-ee36c2bf8edb1c3e3855a928b348d29c6359093d.tar.gz | |
[PATCH] uml problems with linux/io.h
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | crypto/blkcipher.c | 1 | ||||
| -rw-r--r-- | lib/Kconfig | 5 | ||||
| -rw-r--r-- | lib/Makefile | 3 | ||||
| -rw-r--r-- | lib/ioremap.c | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 034c939b..6e93004f 100644 --- a/crypto/blkcipher.c +++ b/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/lib/Kconfig b/lib/Kconfig index 47b172d..9b03581 100644 --- a/lib/Kconfig +++ b/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/lib/Makefile b/lib/Makefile index c9ec8f1..77b4bad 100644 --- a/lib/Makefile +++ b/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/lib/ioremap.c b/lib/ioremap.c index 99fa277..a9e4415 100644 --- a/lib/ioremap.c +++ b/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> |
