Merge branch 'linus' into core/softlockup

[pandora-kernel.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 9be11b0..07c03b9 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -770,7 +770,7 @@ config UART1_RTS_PIN
 
 config SERIAL_BFIN_UART2
        bool "Enable UART2"
-       depends on SERIAL_BFIN && (BF54x)
+       depends on SERIAL_BFIN && (BF54x || BF538 || BF539)
        help
          Enable UART2
 
@@ -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.