summary refs log tree commit diff
path: root/drivers/tty/serial/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-09-04 09:11:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-09-04 09:14:20 -0700
commit062a68a5e0aaa9577d75391ffafa11e3c2a5f892 (patch)
tree0e77ed0c4aab7319e9f704ebebc3ddaf2d0138f7 /drivers/tty/serial/Kconfig
parenta4fdb2a46f617b8b2cd47acec026ec16532edbc6 (diff)
downloadlinux-062a68a5e0aaa9577d75391ffafa11e3c2a5f892.tar.gz
Revert "uart: pl011: Add support to ZTE ZX296702 uart"
This reverts commit 8cd90e50d1408c65c355084b1c7f8f9085f49c6b as with
this patch the serial console is broken on lots of platforms.

Reported-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Jun Nie <jun.nie@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/Kconfig')
-rw-r--r--drivers/tty/serial/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index ed299b9e6375..687b1ea294b7 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -47,12 +47,12 @@ config SERIAL_AMBA_PL010_CONSOLE
 
 config SERIAL_AMBA_PL011
 	tristate "ARM AMBA PL011 serial port support"
-	depends on ARM_AMBA || SOC_ZX296702
+	depends on ARM_AMBA
 	select SERIAL_CORE
 	help
 	  This selects the ARM(R) AMBA(R) PrimeCell PL011 UART.  If you have
 	  an Integrator/PP2, Integrator/CP or Versatile platform, say Y or M
-	  here. Say Y or M if you have SOC_ZX296702.
+	  here.
 
 	  If unsure, say N.