linux-next: manual merge of the tty tree with the i.MX tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/Kconfig between commit
47d37d6f94ccf32d302492f969209930b2411f9e ("serial: Add auart driver for
i.MX23/28") from the i.M tree and commit
4564e1ef219fa69ed827fe2613569543a6b26fbc ("serial: pch_uart: support new
device ML7213") from the tty tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/tty/serial/Kconfig
index ef164f5,aaedbad..0000000
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -1574,18 -1596,8 +1573,23 @@@ config SERIAL_PCH_UAR
  	  which is an IOH(Input/Output Hub) for x86 embedded processor.
  	  Enabling PCH_DMA, this PCH UART works as DMA mode.
  
+ 	  This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/
+ 	  Output Hub) which is for IVI(In-Vehicle Infotainment) use.
+ 	  ML7213 is companion chip for Intel Atom E6xx series.
+ 	  ML7213 is completely compatible for Intel EG20T PCH.
++
 +config SERIAL_MXS_AUART
 +	depends on ARCH_MXS
 +	tristate "MXS AUART support"
 +	select SERIAL_CORE
 +	help
 +	  This driver supports the MXS Application UART (AUART) port.
 +
 +config SERIAL_MXS_AUART_CONSOLE
 +	bool "MXS AUART console support"
 +	depends on SERIAL_MXS_AUART=y
 +	select SERIAL_CORE_CONSOLE
 +	help
 +	  Enable a MXS AUART port to be the system console.
 +
  endmenu
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/