Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnem...

[linux-2.6-omap-h63xx.git] / include / asm-alpha / termios.h

diff --git a/include/asm-alpha/termios.h b/include/asm-alpha/termios.h
index 39e492c3bfa3fe33c78c20aa796c89888d6b702e..fa13716a11c3b214fbb7494242d34e0f30096f63 100644 (file)
--- a/include/asm-alpha/termios.h
+++ b/include/asm-alpha/termios.h
@@ -81,7 +81,7 @@ struct termio {
 
 #define user_termio_to_kernel_termios(a_termios, u_termio)                     \
 ({                                                                             \
-       struct termios *k_termios = (a_termios);                                \
+       struct ktermios *k_termios = (a_termios);                               \
        struct termio k_termio;                                                 \
        int canon, ret;                                                         \
                                                                                \
@@ -113,7 +113,7 @@ struct termio {
  */
 #define kernel_termios_to_user_termio(u_termio, a_termios)             \
 ({                                                                     \
-       struct termios *k_termios = (a_termios);                        \
+       struct ktermios *k_termios = (a_termios);                       \
        struct termio k_termio;                                         \
        int canon;                                                      \
                                                                        \