summaryrefslogtreecommitdiffstats
path: root/include/asm-arm26/io.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-21 02:46:21 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-21 02:46:21 +0200
commit70ac4385a13f78bc478f26d317511893741b05bd (patch)
treedafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-arm26/io.h
parentMerge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff)
parentMerge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/... (diff)
downloadlinux-70ac4385a13f78bc478f26d317511893741b05bd.tar.xz
linux-70ac4385a13f78bc478f26d317511893741b05bd.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts: include/linux/nfs_fs.h Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/asm-arm26/io.h')
-rw-r--r--include/asm-arm26/io.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm26/io.h b/include/asm-arm26/io.h
index 02f94d88a124..2aa033bd0678 100644
--- a/include/asm-arm26/io.h
+++ b/include/asm-arm26/io.h
@@ -22,7 +22,6 @@
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/types.h>
#include <asm/byteorder.h>
#include <asm/memory.h>