V4L/DVB (6451): v4l2: add support for bus-based I2C drivers

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

diff --git a/include/asm-alpha/termios.h b/include/asm-alpha/termios.h
index 1cfd27f0ad7310278a062d602a7e24eccba4fb88..fa13716a11c3b214fbb7494242d34e0f30096f63 100644 (file)
--- a/include/asm-alpha/termios.h
+++ b/include/asm-alpha/termios.h
@@ -66,24 +66,6 @@ struct termio {
 #define _VEOL2 6
 #define _VSWTC 7
 
-/* line disciplines */
-#define N_TTY          0
-#define N_SLIP         1
-#define N_MOUSE                2
-#define N_PPP          3
-#define N_STRIP                4
-#define N_AX25         5
-#define N_X25          6       /* X.25 async */
-#define N_6PACK                7
-#define N_MASC         8       /* Reserved for Mobitex module <kaz@cafe.net> */
-#define N_R3964                9       /* Reserved for Simatic R3964 module */
-#define N_PROFIBUS_FDL 10      /* Reserved for Profibus <Dave@mvhi.com> */
-#define N_IRDA         11      /* Linux IrDa - http://irda.sourceforge.net/ */
-#define N_SMSBLOCK     12      /* SMS block mode - for talking to GSM data cards about SMS messages */
-#define N_HDLC         13      /* synchronous HDLC */
-#define N_SYNC_PPP     14
-#define N_HCI          15  /* Bluetooth HCI UART */
-
 #ifdef __KERNEL__
 /*     eof=^D          eol=\0          eol2=\0         erase=del
        werase=^W       kill=^U         reprint=^R      sxtc=\0
@@ -99,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;                                                         \
                                                                                \
@@ -131,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;                                                      \
                                                                        \