Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

[cascardo/linux.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index aff9dcd..c1df767 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -776,24 +776,7 @@ config BFIN_UART0_CTSRTS
        bool "Enable UART0 hardware flow control"
        depends on SERIAL_BFIN_UART0
        help
-         Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
-         signal.
-
-config UART0_CTS_PIN
-       int "UART0 CTS pin"
-       depends on BFIN_UART0_CTSRTS && !BF548
-       default 23
-       help
-         The default pin is GPIO_GP7.
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
-
-config UART0_RTS_PIN
-       int "UART0 RTS pin"
-       depends on BFIN_UART0_CTSRTS && !BF548
-       default 22
-       help
-         The default pin is GPIO_GP6.
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
+         Enable hardware flow control in the driver.
 
 config SERIAL_BFIN_UART1
        bool "Enable UART1"
@@ -805,22 +788,7 @@ config BFIN_UART1_CTSRTS
        bool "Enable UART1 hardware flow control"
        depends on SERIAL_BFIN_UART1
        help
-         Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
-         signal.
-
-config UART1_CTS_PIN
-       int "UART1 CTS pin"
-       depends on BFIN_UART1_CTSRTS && !BF548
-       default -1
-       help
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
-
-config UART1_RTS_PIN
-       int "UART1 RTS pin"
-       depends on BFIN_UART1_CTSRTS && !BF548
-       default -1
-       help
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
+         Enable hardware flow control in the driver.
 
 config SERIAL_BFIN_UART2
        bool "Enable UART2"
@@ -832,22 +800,7 @@ config BFIN_UART2_CTSRTS
        bool "Enable UART2 hardware flow control"
        depends on SERIAL_BFIN_UART2
        help
-         Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
-         signal.
-
-config UART2_CTS_PIN
-       int "UART2 CTS pin"
-       depends on BFIN_UART2_CTSRTS && !BF548
-       default -1
-       help
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
-
-config UART2_RTS_PIN
-       int "UART2 RTS pin"
-       depends on BFIN_UART2_CTSRTS && !BF548
-       default -1
-       help
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
+         Enable hardware flow control in the driver.
 
 config SERIAL_BFIN_UART3
        bool "Enable UART3"
@@ -859,22 +812,7 @@ config BFIN_UART3_CTSRTS
        bool "Enable UART3 hardware flow control"
        depends on SERIAL_BFIN_UART3
        help
-         Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
-         signal.
-
-config UART3_CTS_PIN
-       int "UART3 CTS pin"
-       depends on BFIN_UART3_CTSRTS && !BF548
-       default -1
-       help
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
-
-config UART3_RTS_PIN
-       int "UART3 RTS pin"
-       depends on BFIN_UART3_CTSRTS && !BF548
-       default -1
-       help
-         Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
+         Enable hardware flow control in the driver.
 
 config SERIAL_IMX
        bool "IMX serial port support"
@@ -1381,6 +1319,16 @@ config SERIAL_MSM_CONSOLE
        depends on SERIAL_MSM=y
        select SERIAL_CORE_CONSOLE
 
+config SERIAL_VT8500
+       bool "VIA VT8500 on-chip serial port support"
+       depends on ARM && ARCH_VT8500
+       select SERIAL_CORE
+
+config SERIAL_VT8500_CONSOLE
+       bool "VIA VT8500 serial console support"
+       depends on SERIAL_VT8500=y
+       select SERIAL_CORE_CONSOLE
+
 config SERIAL_NETX
        tristate "NetX serial port support"
        depends on ARM && ARCH_NETX
@@ -1402,7 +1350,7 @@ config SERIAL_NETX_CONSOLE
 
 config SERIAL_OF_PLATFORM
        tristate "Serial port on Open Firmware platform bus"
-       depends on PPC_OF || MICROBLAZE
+       depends on OF
        depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL
        help
          If you have a PowerPC based system that has serial ports
@@ -1632,4 +1580,19 @@ config SERIAL_ALTERA_UART_CONSOLE
        help
          Enable a Altera UART port to be the system console.
 
+config SERIAL_IFX6X60
+        tristate "SPI protocol driver for Infineon 6x60 modem (EXPERIMENTAL)"
+       depends on GPIOLIB && SPI && EXPERIMENTAL
+       help
+         Support for the IFX6x60 modem devices on Intel MID platforms.
+
+config SERIAL_PCH_UART
+       tristate "Intel EG20T PCH UART"
+       depends on PCI && DMADEVICES
+       select SERIAL_CORE
+       select PCH_DMA
+       help
+         This driver is for PCH(Platform controller Hub) UART of Intel EG20T
+         which is an IOH(Input/Output Hub) for x86 embedded processor.
+         Enabling PCH_DMA, this PCH UART works as DMA mode.
 endmenu