linux-next: manual merge of the tty tree with the net-next tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/isdn/gigaset/interface.c between commit 5bd49735db39 ("gigaset:
Use semicolons to terminate statements") from the net-next tree and
commit 2f16669d322e ("TTY: remove re-assignments to tty_driver members")
from the tty tree.

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

diff --cc drivers/isdn/gigaset/interface.c
index b826dac,8f8814a..0000000
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@@ -679,9 -593,8 +593,8 @@@ void gigaset_if_initdriver(struct gigas
  	if (tty == NULL)
  		goto enomem;
  
- 	tty->magic =		TTY_DRIVER_MAGIC;
 -	tty->type =		TTY_DRIVER_TYPE_SERIAL,
 -	tty->subtype =		SERIAL_TYPE_NORMAL,
 +	tty->type =		TTY_DRIVER_TYPE_SERIAL;
 +	tty->subtype =		SERIAL_TYPE_NORMAL;
  	tty->flags =		TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
  
  	tty->driver_name =	procname;

Attachment: pgp00000.pgp
Description: PGP signature