git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/wm8974' into for-2.6.33
[pandora-kernel.git]
/
arch
/
frv
/
include
/
asm
/
termios.h
diff --git
a/arch/frv/include/asm/termios.h
b/arch/frv/include/asm/termios.h
index
a62fb58
..
b4868aa
100644
(file)
--- a/
arch/frv/include/asm/termios.h
+++ b/
arch/frv/include/asm/termios.h
@@
-52,7
+52,7
@@
struct termio {
/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
#ifdef __KERNEL__
-#include <asm-generic/termios.h>
+#include <asm-generic/termios
-base
.h>
#endif
#endif /* _ASM_TERMIOS_H */