---

yaml --- r: 187686 b: refs/heads/master c: 03843a1 h: refs/heads/master v: v3
git-mirror · Feb 24, 2010 · 5b69d1b · 5b69d1b
1 parent 22bd501
commit 5b69d1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f7035f21c10d83994e045a98c0906781dba02d3
+refs/heads/master: 03843a1294073c19783b43f60f3a455dd0672685
diff --git a/trunk/arch/arm/plat-s5p/dev-uart.c b/trunk/arch/arm/plat-s5p/dev-uart.c
@@ -95,6 +95,7 @@ static struct resource s5p_uart2_resource[] = {
 };
 
 static struct resource s5p_uart3_resource[] = {
+#if CONFIG_SERIAL_SAMSUNG_UARTS > 3
 	[0] = {
 		.start	= S5P_PA_UART3,
 		.end	= S5P_PA_UART3 + S5P_SZ_UART,
@@ -115,6 +116,7 @@ static struct resource s5p_uart3_resource[] = {
 		.end	= IRQ_S5P_UART_ERR3,
 		.flags	= IORESOURCE_IRQ,
 	},
+#endif
 };
 
 struct s3c24xx_uart_resources s5p_uart_resources[] __initdata = {

diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig
@@ -551,7 +551,7 @@ config SERIAL_S5PC100
 
 config SERIAL_S5PV210
 	tristate "Samsung S5PV210 Serial port support"
-	depends on SERIAL_SAMSUNG && CPU_S5PV210
+	depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442)
 	select SERIAL_SAMSUNG_UARTS_4
 	default y
 	help