diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
| commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
| tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-ixp4xx/gtwx5715-setup.c | |
| parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-ixp4xx/gtwx5715-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/gtwx5715-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c index dc6725bda3c4..25c21d6665ec 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c | |||
| @@ -32,12 +32,12 @@ | |||
| 32 | #include <asm/types.h> | 32 | #include <asm/types.h> |
| 33 | #include <asm/setup.h> | 33 | #include <asm/setup.h> |
| 34 | #include <asm/memory.h> | 34 | #include <asm/memory.h> |
| 35 | #include <asm/hardware.h> | 35 | #include <mach/hardware.h> |
| 36 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
| 37 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
| 38 | #include <asm/mach/arch.h> | 38 | #include <asm/mach/arch.h> |
| 39 | #include <asm/mach/flash.h> | 39 | #include <asm/mach/flash.h> |
| 40 | #include <asm/arch/gtwx5715.h> | 40 | #include <mach/gtwx5715.h> |
| 41 | 41 | ||
| 42 | /* | 42 | /* |
| 43 | * Xscale UART registers are 32 bits wide with only the least | 43 | * Xscale UART registers are 32 bits wide with only the least |