diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/mach-s3c2412/mach-jive.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-jive.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index ad980a1690c2..b08f18c8c47a 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
| @@ -30,7 +30,7 @@ | |||
| 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/plat-s3c/regs-serial.h> | 33 | #include <plat/regs-serial.h> |
| 34 | #include <asm/plat-s3c/nand.h> | 34 | #include <asm/plat-s3c/nand.h> |
| 35 | #include <asm/plat-s3c/iic.h> | 35 | #include <asm/plat-s3c/iic.h> |
| 36 | 36 | ||
| @@ -48,10 +48,10 @@ | |||
| 48 | #include <linux/mtd/nand_ecc.h> | 48 | #include <linux/mtd/nand_ecc.h> |
| 49 | #include <linux/mtd/partitions.h> | 49 | #include <linux/mtd/partitions.h> |
| 50 | 50 | ||
| 51 | #include <asm/plat-s3c24xx/clock.h> | 51 | #include <plat/clock.h> |
| 52 | #include <asm/plat-s3c24xx/devs.h> | 52 | #include <plat/devs.h> |
| 53 | #include <asm/plat-s3c24xx/cpu.h> | 53 | #include <plat/cpu.h> |
| 54 | #include <asm/plat-s3c24xx/pm.h> | 54 | #include <plat/pm.h> |
| 55 | #include <asm/plat-s3c24xx/udc.h> | 55 | #include <asm/plat-s3c24xx/udc.h> |
| 56 | 56 | ||
| 57 | static struct map_desc jive_iodesc[] __initdata = { | 57 | static struct map_desc jive_iodesc[] __initdata = { |