diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-01-29 16:55:56 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-01-29 16:55:56 -0600 |
| commit | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (patch) | |
| tree | 356ea7846023503e92e1d5faca68debf1b77a23e /drivers/serial/Kconfig | |
| parent | aaca4ff0917f62433f222f9fb0d04c1d61ad68cf (diff) | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/Kconfig')
| -rw-r--r-- | drivers/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 3e525e38a5d..7d7f576da20 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -982,7 +982,7 @@ config SERIAL_SH_SCI_CONSOLE config SERIAL_PNX8XXX bool "Enable PNX8XXX SoCs' UART Support" - depends on MIPS && SOC_PNX8550 + depends on MIPS && (SOC_PNX8550 || SOC_PNX833X) select SERIAL_CORE help If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330 |