From db44a58d19b17565505ae94869ff4e17d989da93 Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Sun, 30 Sep 2012 13:19:19 +0400
Subject: [PATCH] --- yaml --- r: 334563 b: refs/heads/master c:
 725dd00a99dd5fb94af55115bf7ade59624c8bc3 h: refs/heads/master i:   334561:
 5610b66be26915f529430140f8944c50db5073d9   334559:
 bfc808e4acc76cd30e46258100574f6bc5b4dc47 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/tty/serial/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f3a28cbf73af..70ce9608aba5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2351a6c6e7d5a5e848411b5dd2c02142497624cc
+refs/heads/master: 725dd00a99dd5fb94af55115bf7ade59624c8bc3
diff --git a/trunk/drivers/tty/serial/Kconfig b/trunk/drivers/tty/serial/Kconfig
index 233fbaaf2559..2a53be5f010d 100644
--- a/trunk/drivers/tty/serial/Kconfig
+++ b/trunk/drivers/tty/serial/Kconfig
@@ -1150,7 +1150,7 @@ config SERIAL_SC26XX_CONSOLE
 	  Support for Console on SC2681/SC2692 serial ports.
 
 config SERIAL_SCCNXP
-	bool "SCCNXP serial port support"
+	tristate "SCCNXP serial port support"
 	depends on !SERIAL_SC26XX
 	select SERIAL_CORE
 	default n
@@ -1162,7 +1162,7 @@ config SERIAL_SCCNXP
 
 config SERIAL_SCCNXP_CONSOLE
 	bool "Console on SCCNXP serial port"
-	depends on SERIAL_SCCNXP
+	depends on SERIAL_SCCNXP=y
 	select SERIAL_CORE_CONSOLE
 	help
 	  Support for console on SCCNXP serial ports.