git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.30' into for-2.6.31
[sfrench/cifs-2.6.git]
/
arch
/
cris
/
include
/
asm
/
termios.h
diff --git
a/arch/cris/include/asm/termios.h
b/arch/cris/include/asm/termios.h
index b0124e6c2e416d7273fe274a9b36d7d7fb65d093..1265109f4ce3b485ac68623a889cd5a5621c079b 100644
(file)
--- a/
arch/cris/include/asm/termios.h
+++ b/
arch/cris/include/asm/termios.h
@@
-4,6
+4,7
@@
#include <asm/termbits.h>
#include <asm/ioctls.h>
#include <asm/rs485.h>
+#include <linux/serial.h>
struct winsize {
unsigned short ws_row;