diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 10:18:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 10:18:34 +1100 |
| commit | 4e7cd87f6ef453981ef6c4c7c8c06ca096a00d14 (patch) | |
| tree | 126b89b809954a8de34b0a49fd9cf81691dfb6d9 /arch/arm/mach-s3c64xx/mach-anw6410.c | |
| parent | b6a6ed84f9e21a830f58b2876b4d3a4741cf1056 (diff) | |
| parent | e98cd7220a1b8adcd974781eef40651952ec5b4c (diff) | |
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/iio/adc/at91_adc.txt
Documentation/devicetree/bindings/phy/samsung-phy.txt
arch/arm/boot/dts/imx53-qsb.dts
arch/arm/boot/dts/keystone-clocks.dtsi
arch/arm/boot/dts/sun7i-a20.dtsi
arch/arm/mach-imx/pm-imx6q.c
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-zynq/Kconfig
arch/arm/mach-zynq/common.c
drivers/clocksource/Kconfig
drivers/phy/Kconfig
drivers/watchdog/Kconfig
drivers/watchdog/orion_wdt.c
include/asm-generic/vmlinux.lds.h
sound/soc/kirkwood/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-anw6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-anw6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index ddeb0e51a962..55eb6a69655b 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c @@ -20,6 +20,7 @@ #include <linux/timer.h> #include <linux/init.h> #include <linux/serial_core.h> +#include <linux/serial_s3c.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/i2c.h> @@ -41,7 +42,6 @@ #include <asm/irq.h> #include <asm/mach-types.h> -#include <plat/regs-serial.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/fb.h> |