diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /arch/arm/mach-s3c2412/mach-jive.c | |
| parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
| parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) | |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-jive.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index b08f18c8c47a..25ff1ec9f8ad 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
| @@ -31,8 +31,8 @@ | |||
| 31 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
| 32 | 32 | ||
| 33 | #include <plat/regs-serial.h> | 33 | #include <plat/regs-serial.h> |
| 34 | #include <asm/plat-s3c/nand.h> | 34 | #include <plat/nand.h> |
| 35 | #include <asm/plat-s3c/iic.h> | 35 | #include <plat/iic.h> |
| 36 | 36 | ||
| 37 | #include <mach/regs-power.h> | 37 | #include <mach/regs-power.h> |
| 38 | #include <mach/regs-gpio.h> | 38 | #include <mach/regs-gpio.h> |
| @@ -52,7 +52,7 @@ | |||
| 52 | #include <plat/devs.h> | 52 | #include <plat/devs.h> |
| 53 | #include <plat/cpu.h> | 53 | #include <plat/cpu.h> |
| 54 | #include <plat/pm.h> | 54 | #include <plat/pm.h> |
| 55 | #include <asm/plat-s3c24xx/udc.h> | 55 | #include <plat/udc.h> |
| 56 | 56 | ||
| 57 | static struct map_desc jive_iodesc[] __initdata = { | 57 | static struct map_desc jive_iodesc[] __initdata = { |
| 58 | }; | 58 | }; |