Merge tag 'tty-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-drm-fsl-dcu.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index e71a28b4b94ebaa7804e8ffd7bacb44fc892c022..c79b43cd6014a9916494230940b548f432b2e290 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -249,14 +249,14 @@ config SERIAL_SAMSUNG
 
 config SERIAL_SAMSUNG_UARTS_4
        bool
-       depends on PLAT_SAMSUNG
+       depends on SERIAL_SAMSUNG
        default y if !(CPU_S3C2410 || CPU_S3C2412 || CPU_S3C2440 || CPU_S3C2442)
        help
          Internal node for the common case of 4 Samsung compatible UARTs
 
 config SERIAL_SAMSUNG_UARTS
        int
-       depends on PLAT_SAMSUNG
+       depends on SERIAL_SAMSUNG
        default 4 if SERIAL_SAMSUNG_UARTS_4 || CPU_S3C2416
        default 3
        help
@@ -701,7 +701,7 @@ config PDC_CONSOLE
          Saying Y here will enable the software based PDC console to be 
          used as the system console.  This is useful for machines in 
          which the hardware based console has not been written yet.  The
-         following steps must be competed to use the PDC console:
+         following steps must be completed to use the PDC console:
 
            1. create the device entry (mknod /dev/ttyB0 c 11 0)
            2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0