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-pxa/colibri.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-pxa/colibri.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c index 574839d7c132..abce13c846c5 100644 --- a/arch/arm/mach-pxa/colibri.c +++ b/arch/arm/mach-pxa/colibri.c | |||
| @@ -21,16 +21,16 @@ | |||
| 21 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
| 22 | #include <linux/mtd/physmap.h> | 22 | #include <linux/mtd/physmap.h> |
| 23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
| 24 | #include <asm/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
| 26 | #include <asm/sizes.h> | 26 | #include <asm/sizes.h> |
| 27 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
| 28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
| 29 | #include <asm/mach/irq.h> | 29 | #include <asm/mach/irq.h> |
| 30 | #include <asm/mach/flash.h> | 30 | #include <asm/mach/flash.h> |
| 31 | #include <asm/arch/pxa-regs.h> | 31 | #include <mach/pxa-regs.h> |
| 32 | #include <asm/arch/pxa2xx-gpio.h> | 32 | #include <mach/pxa2xx-gpio.h> |
| 33 | #include <asm/arch/colibri.h> | 33 | #include <mach/colibri.h> |
| 34 | 34 | ||
| 35 | #include "generic.h" | 35 | #include "generic.h" |
| 36 | #include "devices.h" | 36 | #include "devices.h" |