Merge branch 'rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7d7f576da202728435d314a501e086418d09dd10..aa9d3a4c2d50ba86470fe3706e9d7193e72de9cf 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -628,7 +628,7 @@ config SERIAL_MPSC_CONSOLE
 
 config SERIAL_PXA
        bool "PXA serial port support"
-       depends on ARM && ARCH_PXA
+       depends on ARCH_PXA || ARCH_MMP
        select SERIAL_CORE
        help
          If you have a machine based on an Intel XScale PXA2xx CPU you
@@ -1374,7 +1374,7 @@ config SERIAL_BFIN_SPORT
        depends on BLACKFIN && EXPERIMENTAL
        select SERIAL_CORE
        help
-         Enble support SPORT emulate UART on Blackfin series.
+         Enable SPORT emulate UART on Blackfin series.
 
          To compile this driver as a module, choose M here: the
          module will be called bfin_sport_uart.