Merge branch 'master' into for-next

[sfrench/cifs-2.6.git] / drivers / tty / serial / 8250 / Kconfig

diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index f3d283f2e3aa280598867500de23f142cb050670..c31133a6ea8e0361f1f84103c469026bda82c077 100644 (file)
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -271,7 +271,7 @@ config SERIAL_8250_DW
          present in the Synopsys DesignWare APB UART.
 
 config SERIAL_8250_EM
-       tristate "Support for Emma Mobile intergrated serial port"
+       tristate "Support for Emma Mobile integrated serial port"
        depends on SERIAL_8250 && ARM && HAVE_CLK
        help
          Selecting this option will add support for the integrated serial