Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 0b36dd5cdac2c4741b2919247015b8640f54e9c7..d0edbaacb1f7a8b6277a566f0d5ed2c15c389ba8 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -663,7 +663,7 @@ config V850E_UART
 
 config V850E_UARTB
         bool
-       depends V850E_UART && V850E_ME2
+       depends on V850E_UART && V850E_ME2
        default y
 
 config V850E_UART_CONSOLE
@@ -909,13 +909,18 @@ config SERIAL_M32R_PLDSIO
 
 config SERIAL_TXX9
        bool "TMPTX39XX/49XX SIO support"
-       depends HAS_TXX9_SERIAL
+       depends on HAS_TXX9_SERIAL
        select SERIAL_CORE
        default y
 
 config HAS_TXX9_SERIAL
        bool
 
+config SERIAL_TXX9_NR_UARTS
+       int "Maximum number of TMPTX39XX/49XX SIO ports"
+       depends on SERIAL_TXX9
+       default "6"
+
 config SERIAL_TXX9_CONSOLE
        bool "TMPTX39XX/49XX SIO Console support"
        depends on SERIAL_TXX9=y
@@ -994,4 +999,14 @@ config SERIAL_NETX_CONSOLE
          If you have enabled the serial port on the Motorola IMX
          CPU you can make it the console by answering Y to this option.
 
+config SERIAL_OF_PLATFORM
+       tristate "Serial port on Open Firmware platform bus"
+       depends on PPC_OF
+       depends on SERIAL_8250
+       help
+         If you have a PowerPC based system that has serial ports
+         on a platform specific bus, you should enable this option.
+         Currently, only 8250 compatible ports are supported, but
+         others can easily be added.
+
 endmenu