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-s3c2410/s3c2410.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-s3c2410/s3c2410.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2410.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c index b1e658c917a0..ac79b536c4c3 100644 --- a/arch/arm/mach-s3c2410/s3c2410.c +++ b/arch/arm/mach-s3c2410/s3c2410.c | |||
| @@ -29,12 +29,12 @@ | |||
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | 30 | ||
| 31 | #include <mach/regs-clock.h> | 31 | #include <mach/regs-clock.h> |
| 32 | #include <asm/plat-s3c/regs-serial.h> | 32 | #include <plat/regs-serial.h> |
| 33 | 33 | ||
| 34 | #include <asm/plat-s3c24xx/s3c2410.h> | 34 | #include <plat/s3c2410.h> |
| 35 | #include <asm/plat-s3c24xx/cpu.h> | 35 | #include <plat/cpu.h> |
| 36 | #include <asm/plat-s3c24xx/devs.h> | 36 | #include <plat/devs.h> |
| 37 | #include <asm/plat-s3c24xx/clock.h> | 37 | #include <plat/clock.h> |
| 38 | 38 | ||
| 39 | /* Initial IO mappings */ | 39 | /* Initial IO mappings */ |
| 40 | 40 | ||