diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 02:55:32 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 02:55:32 -0500 |
| commit | b85b64cc22122adca695e0f8c340cc677ad92e8c (patch) | |
| tree | 66d1c90beab0f220a112cafafeac840fb174bd1b /arch/arm/mach-s3c24xx/s3c244x.c | |
| parent | c877533ca36e01eae740fd40c4fe854b0c9bd818 (diff) | |
| parent | ad38bdd15d5b97dcb1ffc46ea77c237e30312fbb (diff) | |
Merge branch 'next/timer-samsung' into next/clk-exynos
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c244x.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c244x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c index ad2671baa910..2a35edb67354 100644 --- a/arch/arm/mach-s3c24xx/s3c244x.c +++ b/arch/arm/mach-s3c24xx/s3c244x.c | |||
| @@ -37,8 +37,6 @@ | |||
| 37 | #include <plat/regs-serial.h> | 37 | #include <plat/regs-serial.h> |
| 38 | #include <mach/regs-gpio.h> | 38 | #include <mach/regs-gpio.h> |
| 39 | 39 | ||
| 40 | #include <plat/s3c2410.h> | ||
| 41 | #include <plat/s3c244x.h> | ||
| 42 | #include <plat/clock.h> | 40 | #include <plat/clock.h> |
| 43 | #include <plat/devs.h> | 41 | #include <plat/devs.h> |
| 44 | #include <plat/cpu.h> | 42 | #include <plat/cpu.h> |