Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b3e920 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] tty: minor merge correction 



Its now used.. because we added the new definitions so enabled all the
goodies on i386

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d75e26a8

include/asm-i386/termbits.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ struct ktermios { 
#define  B3000000 0010015

#define  B3500000 0010016

#define  B4000000 0010017

#define CIBAUD	  002003600000	/* input baud rate (not used) */

#define CIBAUD	  002003600000

#define CMSPAR	  010000000000		/* mark or space (stick) parity */

#define CRTSCTS	  020000000000		/* flow control */