diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-03-21 04:04:15 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-03-21 04:04:15 +0900 |
| commit | 8460dc7f2777d564b4cf094721e9de6e6657e11c (patch) | |
| tree | 1bb42486559591c4de0bf19739b694670098f549 /arch/arm/mach-s3c64xx/common.c | |
| parent | e11d919e4aa2009077e3e4f829ff991d37adca61 (diff) | |
| parent | 19a964644f1e655c3f67d539c1e99a9fbcc4588c (diff) | |
Merge branch 'v3.15-next/cleanup-samsung-2' into v3.15-next/s2r-pm-samsung-2
Diffstat (limited to 'arch/arm/mach-s3c64xx/common.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 76ab595d849..5c45aae675b 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -25,6 +25,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/serial_core.h> +#include <linux/serial_s3c.h> #include <linux/platform_device.h> #include <linux/reboot.h> #include <linux/io.h> @@ -50,7 +51,6 @@ #include <plat/irq-uart.h> #include <plat/pwm-core.h> #include <plat/regs-irqtype.h> -#include <plat/regs-serial.h> #include <plat/watchdog-reset.h> #include "common.h" |