summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:39:56 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:39:56 -0700
commit1dd465cac8d3ba18a9840d032f6604147269c031 (patch)
tree78f00fdeae26d018def75e7517aa50e56f4994df /arch/arm/mach-versatile
parenta2218cac0aacecbecebd3cabc43cc8a4a09cecbb (diff)
parent217874feed0d3a6543a6b7127782f4a08bffd731 (diff)
downloadop-kernel-dev-1dd465cac8d3ba18a9840d032f6604147269c031.zip
op-kernel-dev-1dd465cac8d3ba18a9840d032f6604147269c031.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-versatile')
-rw-r--r--arch/arm/mach-versatile/core.c1
-rw-r--r--arch/arm/mach-versatile/pci.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 58c1330..a30e045 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -30,7 +30,6 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/leds.h>
-#include <asm/mach-types.h>
#include <asm/hardware/amba.h>
#include <asm/hardware/amba_clcd.h>
#include <asm/hardware/arm_timer.h>
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index d1565e8..b80d57d 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -29,7 +29,6 @@
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
/*
* these spaces are mapped using the following base registers:
OpenPOWER on IntegriCloud