diff --git a/[refs] b/[refs] index 42aa39ce0320..ef3876cb1366 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2eb4c95094d927f2eb094f720222cc5a9cc22fd3 +refs/heads/master: b7d331281488193621e255f47773e42f406b939d diff --git a/trunk/include/asm-i386/termios.h b/trunk/include/asm-i386/termios.h index f520b7c16fa2..6fdb2c841b73 100644 --- a/trunk/include/asm-i386/termios.h +++ b/trunk/include/asm-i386/termios.h @@ -40,7 +40,6 @@ struct termio { /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ #ifdef __KERNEL__ -#include /* intr=^C quit=^\ erase=del kill=^U eof=^D vtime=\0 vmin=\1 sxtc=\0