summaryrefslogtreecommitdiffstats
path: root/include/asm-frv/termios.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-01 14:08:45 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-02 01:17:05 +0100
commite7bc537db9e13adee1f294aa370f16d80f40b73d (patch)
tree23d7c8f6c66c197faa869055a6fc5e4edb3fa6ee /include/asm-frv/termios.h
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-e7bc537db9e13adee1f294aa370f16d80f40b73d.tar.xz
linux-e7bc537db9e13adee1f294aa370f16d80f40b73d.zip
[PATCH] fix frv headers_check
a) registers.h is really needed there b) include of asm-generic/termios should be under __KERNEL__ c) includes of asm-generic/{memory_model,page} should be under __KERNEL (nothing in there that would work in userland) d) a lot of stuff in ptrace.h should be under __KERNEL__. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--include/asm-frv/termios.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-frv/termios.h b/include/asm-frv/termios.h
index b4a664e7f55c..8840cf95e8dd 100644
--- a/include/asm-frv/termios.h
+++ b/include/asm-frv/termios.h
@@ -69,6 +69,8 @@ struct termio {
#define N_SYNC_PPP 14
#define N_HCI 15 /* Bluetooth HCI UART */
+#ifdef __KERNEL__
#include <asm-generic/termios.h>
+#endif
#endif /* _ASM_TERMIOS_H */