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-s3c2440/mach-rx3715.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-s3c2440/mach-rx3715.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index a4c690456d19..4d14c7cff892 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
| 38 | #include <asm/mach-types.h> | 38 | #include <asm/mach-types.h> |
| 39 | 39 | ||
| 40 | #include <asm/plat-s3c/regs-serial.h> | 40 | #include <plat/regs-serial.h> |
| 41 | #include <mach/regs-gpio.h> | 41 | #include <mach/regs-gpio.h> |
| 42 | #include <mach/regs-lcd.h> | 42 | #include <mach/regs-lcd.h> |
| 43 | 43 | ||
| @@ -45,10 +45,10 @@ | |||
| 45 | #include <asm/plat-s3c/nand.h> | 45 | #include <asm/plat-s3c/nand.h> |
| 46 | #include <mach/fb.h> | 46 | #include <mach/fb.h> |
| 47 | 47 | ||
| 48 | #include <asm/plat-s3c24xx/clock.h> | 48 | #include <plat/clock.h> |
| 49 | #include <asm/plat-s3c24xx/devs.h> | 49 | #include <plat/devs.h> |
| 50 | #include <asm/plat-s3c24xx/cpu.h> | 50 | #include <plat/cpu.h> |
| 51 | #include <asm/plat-s3c24xx/pm.h> | 51 | #include <plat/pm.h> |
| 52 | 52 | ||
| 53 | static struct map_desc rx3715_iodesc[] __initdata = { | 53 | static struct map_desc rx3715_iodesc[] __initdata = { |
| 54 | /* dump ISA space somewhere unused */ | 54 | /* dump ISA space somewhere unused */ |