Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-2.6-microblaze.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index a0162cb..cf9210d 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -729,19 +729,19 @@ config SERIAL_SH_SCI_DMA
 
 config SERIAL_PNX8XXX
        bool "Enable PNX8XXX SoCs' UART Support"
-       depends on SOC_PNX8550 || SOC_PNX833X
+       depends on SOC_PNX833X
        select SERIAL_CORE
        help
-         If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
-         and you want to use serial ports, say Y.  Otherwise, say N.
+         If you have a MIPS-based Philips SoC such as PNX8330 and you want
+         to use serial ports, say Y.  Otherwise, say N.
 
 config SERIAL_PNX8XXX_CONSOLE
        bool "Enable PNX8XX0 serial console"
        depends on SERIAL_PNX8XXX
        select SERIAL_CORE_CONSOLE
        help
-         If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
-         and you want to use serial console, say Y. Otherwise, say N.
+         If you have a MIPS-based Philips SoC such as PNX8330 and you want
+         to use serial console, say Y. Otherwise, say N.
 
 config SERIAL_HS_LPC32XX
        tristate "LPC32XX high speed serial port support"