diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:39:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:39:56 -0400 |
| commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
| tree | 78f00fdeae26d018def75e7517aa50e56f4994df /arch/arm/mach-versatile | |
| parent | a2218cac0aacecbecebd3cabc43cc8a4a09cecbb (diff) | |
| parent | 217874feed0d3a6543a6b7127782f4a08bffd731 (diff) | |
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.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/pci.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 58c1330d8638..a30e0451df72 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
| 32 | #include <asm/leds.h> | 32 | #include <asm/leds.h> |
| 33 | #include <asm/mach-types.h> | ||
| 34 | #include <asm/hardware/amba.h> | 33 | #include <asm/hardware/amba.h> |
| 35 | #include <asm/hardware/amba_clcd.h> | 34 | #include <asm/hardware/amba_clcd.h> |
| 36 | #include <asm/hardware/arm_timer.h> | 35 | #include <asm/hardware/arm_timer.h> |
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c index d1565e851f0e..b80d57d51699 100644 --- a/arch/arm/mach-versatile/pci.c +++ b/arch/arm/mach-versatile/pci.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | #include <asm/system.h> | 30 | #include <asm/system.h> |
| 31 | #include <asm/mach/pci.h> | 31 | #include <asm/mach/pci.h> |
| 32 | #include <asm/mach-types.h> | ||
| 33 | 32 | ||
| 34 | /* | 33 | /* |
| 35 | * these spaces are mapped using the following base registers: | 34 | * these spaces are mapped using the following base registers: |