From 9ce818f10b70455a85e8d4ee1ed81c7e3aad6b1c Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Wed, 1 Feb 2012 00:11:23 +0900 Subject: [PATCH] --- yaml --- r: 287437 b: refs/heads/master c: 5f7b6d19723427a1d406c9640fe6f48fa97b5e1a h: refs/heads/master i: 287435: 9de0f5b2064518e17ec17d278117a8d534037963 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/samsung.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f96722b79aa1..c0aa84d693cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bab08c075e250b0a9bec63fd4c06812bd413a3f +refs/heads/master: 5f7b6d19723427a1d406c9640fe6f48fa97b5e1a diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c index f96f37b5fec6..3b07fb9ac915 100644 --- a/trunk/drivers/tty/serial/samsung.c +++ b/trunk/drivers/tty/serial/samsung.c @@ -1593,7 +1593,8 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = { #define S5PV210_SERIAL_DRV_DATA (kernel_ulong_t)NULL #endif -#ifdef CONFIG_CPU_EXYNOS4210 +#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) || \ + defined(CONFIG_SOC_EXYNOS4412) static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = { .info = &(struct s3c24xx_uart_info) { .name = "Samsung Exynos4 UART",