diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:44:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:44:42 -0400 |
| commit | 740c699a8d316c8bf8593f19e2ca47795e690622 (patch) | |
| tree | a78886955770a477945c5d84e06b2e7678733b54 /arch/arm/mach-s3c24xx/dma-s3c2443.c | |
| parent | e69af4657e7764d03ad555f0b583d9c4217bcefa (diff) | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
Merge tag 'v3.15-rc1' into perf/urgent
Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-s3c24xx/dma-s3c2443.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2443.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/dma-s3c2443.c b/arch/arm/mach-s3c24xx/dma-s3c2443.c index 95b9f759fe97..f4096ec0700a 100644 --- a/arch/arm/mach-s3c24xx/dma-s3c2443.c +++ b/arch/arm/mach-s3c24xx/dma-s3c2443.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
| 19 | #include <linux/serial_s3c.h> | ||
| 19 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 20 | 21 | ||
| 21 | #include <mach/dma.h> | 22 | #include <mach/dma.h> |
| @@ -23,7 +24,6 @@ | |||
| 23 | #include <plat/dma-s3c24xx.h> | 24 | #include <plat/dma-s3c24xx.h> |
| 24 | #include <plat/cpu.h> | 25 | #include <plat/cpu.h> |
| 25 | 26 | ||
| 26 | #include <plat/regs-serial.h> | ||
| 27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
| 28 | #include <plat/regs-dma.h> | 28 | #include <plat/regs-dma.h> |
| 29 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |