diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 00:22:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 00:22:48 -0800 |
| commit | 97c0bd411c188158d4a7e6d4bdee9382dc036be9 (patch) | |
| tree | 3258f0bc1f1256c521edeeb02421ca14ee029ca0 /drivers/tty/serial/samsung.c | |
| parent | 0f327cb11f2b8bd0b6535640e5b46746e43bbfb2 (diff) | |
| parent | b1ce101bb9e52dcd5b143f7f376a04f1db95014c (diff) | |
| download | kernel_replicant_linux-97c0bd411c188158d4a7e6d4bdee9382dc036be9.tar.gz kernel_replicant_linux-97c0bd411c188158d4a7e6d4bdee9382dc036be9.tar.bz2 kernel_replicant_linux-97c0bd411c188158d4a7e6d4bdee9382dc036be9.zip | |
Merge branch 'next/soc-exynos5440' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
From Kukjin Kim:
This is adding support for exynos5440, including Quad ARM Cortex-A15
cores and its reference board SSDK5440.
Note, at this moment, just enabled minimal system part for initial kernel
boot and pinctrl driver.
* 'next/soc-exynos5440' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add pin controller node for Samsung EXYNOS5440 SoC
pinctrl: exynos5440: add pinctrl driver for Samsung EXYNOS5440 SoC
ARM: dts: add initial dts file for EXYNOS5440, SSDK5440
ARM: EXYNOS: add support for EXYNOS5440 SoC
Add/add conflict in arch/arm/boot/dts/Makefile.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/tty/serial/samsung.c')
| -rw-r--r-- | drivers/tty/serial/samsung.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 7f04717176aa..0e26a1656fa6 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1646,7 +1646,8 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = { #endif #if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) || \ - defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250) + defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250) || \ + defined(CONFIG_SOC_EXYNOS5440) static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = { .info = &(struct s3c24xx_uart_info) { .name = "Samsung Exynos4 UART", |