diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 17:55:24 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 17:55:24 +1000 |
commit | a42bc5ef61cd6a1e7b9ef9a04a16bae628e23d6c (patch) | |
tree | e41ef340022a85abeefa9cba070c30acda5e0b06 /arch/s390/include/asm/termios.h | |
parent | fe8b44a9ede7df70b886e53d3ca609eaa675aaf1 (diff) | |
parent | 52f9ce5dd9c55445b658cde1d3883afa871b4828 (diff) |
Merge commit 'asm-generic/next'
Diffstat (limited to 'arch/s390/include/asm/termios.h')
-rw-r--r-- | arch/s390/include/asm/termios.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/termios.h b/arch/s390/include/asm/termios.h index 67f66278f533..bc3a35cefc96 100644 --- a/arch/s390/include/asm/termios.h +++ b/arch/s390/include/asm/termios.h @@ -60,7 +60,7 @@ struct termio { #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) -#include <asm-generic/termios.h> +#include <asm-generic/termios-base.h> #endif /* __KERNEL__ */ |