summaryrefslogtreecommitdiff
path: root/include/asm-arm/pgtable-nommu.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-05 16:15:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-05 16:15:00 -0700
commit39b945a37bac2b692773a470890c8ba301485b15 (patch)
treefe599a2cb77afa5dcfc3c07ef7f23933ea723f2e /include/asm-arm/pgtable-nommu.h
parent203c80187eba037f2d6562e0d5847014746726dd (diff)
parent0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-armtip-x86-idle-2008-06-16_09.18_Mon
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: fix tosa.c build error [ARM] 5067/1: _raw_write_can_lock macro bugfix [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration [ARM] 5068/1: PXA2xx Additional gpio definitions [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP [ARM] 5060/1: remove unnecessary include of asm/io.h [ARM] fix AT91 include loops
Diffstat (limited to 'include/asm-arm/pgtable-nommu.h')
-rw-r--r--include/asm-arm/pgtable-nommu.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/pgtable-nommu.h b/include/asm-arm/pgtable-nommu.h
index 2e5868bbe03b..386fcc10a973 100644
--- a/include/asm-arm/pgtable-nommu.h
+++ b/include/asm-arm/pgtable-nommu.h
@@ -16,7 +16,6 @@
#include <linux/slab.h>
#include <asm/processor.h>
#include <asm/page.h>
-#include <asm/io.h>
/*
* Trivial page table functions.