Subject: linux-next: manual merge of the tty tree with the genesis tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 27 Jul 2010 14:34:30 +1000

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
include/linux/serial_core.h between commit
75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
found on some sh-mobile SoCs") from the genesis tree and commit
c3190cf68dfc58c33de0fd59b919cbb864acbba4 ("hsu: driver for Medfield High
Speed UART device") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc include/linux/serial_core.h
index 5228320,f8fce35..0000000
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@@ -186,9 -186,12 +186,15 @@@
  #define PORT_ALTERA_JTAGUART	91
  #define PORT_ALTERA_UART	92
  
 +/* SH-SCI */
 +#define PORT_SCIFB	93
 +
+ /* MAX3107 */
+ #define PORT_MAX3107	94
+ 
+ /* High Speed UART for Medfield */
+ #define PORT_MFD	95
+ 
  #ifdef __KERNEL__
  
  #include <linux/compiler.h>