lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 2.6.38-rc6 into tty-next

Browse Source 
This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2011-02-24 11:36:31 -08:00
parent fec38d1752 f5412be599
commit f227e08b71
738 changed files with 7909 additions and 5897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/tty/n_gsm.c
View File

@@ -2414,6 +2414,7 @@ static int gsmld_config(struct tty_struct *tty, struct gsm_mux *gsm,
gsm->initiator = c->initiator;
gsm->mru = c->mru;
gsm->mtu = c->mtu;
gsm->encoding = c->encapsulation;
gsm->adaption = c->adaption;
gsm->n2 = c->n2;