diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 02:59:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 02:59:10 -0400 |
| commit | cc4949e1fdade5d063e9f8783cf0e2cc92041ce5 (patch) | |
| tree | 4023bd641bfe464efbde518fb504d6865c9df014 /arch/frv/include/asm/termios.h | |
| parent | 28b4868820a56de661f54742ff91b78e12f1e582 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest to fix a bug in it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/frv/include/asm/termios.h')
| -rw-r--r-- | arch/frv/include/asm/termios.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/include/asm/termios.h b/arch/frv/include/asm/termios.h index a62fb5872375..b4868aafe79c 100644 --- a/arch/frv/include/asm/termios.h +++ b/arch/frv/include/asm/termios.h | |||
| @@ -52,7 +52,7 @@ struct termio { | |||
| 52 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ | 52 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ |
| 53 | 53 | ||
| 54 | #ifdef __KERNEL__ | 54 | #ifdef __KERNEL__ |
| 55 | #include <asm-generic/termios.h> | 55 | #include <asm-generic/termios-base.h> |
| 56 | #endif | 56 | #endif |
| 57 | 57 | ||
| 58 | #endif /* _ASM_TERMIOS_H */ | 58 | #endif /* _ASM_TERMIOS_H */ |