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-s3c2410/mach-vr1000.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-s3c2410/mach-vr1000.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 7be0bb629bfa..fbc0213d5485 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
| @@ -30,19 +30,19 @@ | |||
| 30 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
| 31 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
| 32 | 32 | ||
| 33 | #include <asm/arch/bast-map.h> | 33 | #include <mach/bast-map.h> |
| 34 | #include <asm/arch/vr1000-map.h> | 34 | #include <mach/vr1000-map.h> |
| 35 | #include <asm/arch/vr1000-irq.h> | 35 | #include <mach/vr1000-irq.h> |
| 36 | #include <asm/arch/vr1000-cpld.h> | 36 | #include <mach/vr1000-cpld.h> |
| 37 | 37 | ||
| 38 | #include <asm/hardware.h> | 38 | #include <mach/hardware.h> |
| 39 | #include <asm/io.h> | 39 | #include <asm/io.h> |
| 40 | #include <asm/irq.h> | 40 | #include <asm/irq.h> |
| 41 | #include <asm/mach-types.h> | 41 | #include <asm/mach-types.h> |
| 42 | 42 | ||
| 43 | #include <asm/plat-s3c/regs-serial.h> | 43 | #include <asm/plat-s3c/regs-serial.h> |
| 44 | #include <asm/arch/regs-gpio.h> | 44 | #include <mach/regs-gpio.h> |
| 45 | #include <asm/arch/leds-gpio.h> | 45 | #include <mach/leds-gpio.h> |
| 46 | 46 | ||
| 47 | #include <asm/plat-s3c24xx/clock.h> | 47 | #include <asm/plat-s3c24xx/clock.h> |
| 48 | #include <asm/plat-s3c24xx/devs.h> | 48 | #include <asm/plat-s3c24xx/devs.h> |