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/plat-samsung/init.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/plat-samsung/init.c')
-rw-r--r-- | arch/arm/plat-samsung/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c index aa9511b6914a..a1f925f3121f 100644 --- a/arch/arm/plat-samsung/init.c +++ b/arch/arm/plat-samsung/init.c @@ -21,11 +21,10 @@ #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/of.h> -#include <mach/hardware.h> - #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -33,8 +32,6 @@ #include <plat/devs.h> #include <plat/clock.h> -#include <plat/regs-serial.h> - static struct cpu_table *cpu; static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode, @@ -97,7 +94,9 @@ void __init s3c24xx_init_clocks(int xtal) #if IS_ENABLED(CONFIG_SAMSUNG_ATAGS) static int nr_uarts __initdata = 0; +#ifdef CONFIG_SERIAL_SAMSUNG_UARTS static struct s3c2410_uartcfg uart_cfgs[CONFIG_SERIAL_SAMSUNG_UARTS]; +#endif /* s3c24xx_init_uartdevs * @@ -112,6 +111,7 @@ void __init s3c24xx_init_uartdevs(char *name, struct s3c24xx_uart_resources *res, struct s3c2410_uartcfg *cfg, int no) { +#ifdef CONFIG_SERIAL_SAMSUNG_UARTS struct platform_device *platdev; struct s3c2410_uartcfg *cfgptr = uart_cfgs; struct s3c24xx_uart_resources *resp; @@ -134,6 +134,7 @@ void __init s3c24xx_init_uartdevs(char *name, } nr_uarts = no; +#endif } void __init s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no) |