diff options
| -rw-r--r-- | sys/alpha/linux/linux_ioctl.h | 2 | ||||
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/alpha/linux/linux_ioctl.h b/sys/alpha/linux/linux_ioctl.h index 6944b6d..8410f10 100644 --- a/sys/alpha/linux/linux_ioctl.h +++ b/sys/alpha/linux/linux_ioctl.h @@ -286,7 +286,7 @@ #define LINUX_VQUIT 9 #define LINUX_VMIN 16 #define LINUX_VTIME 17 -#define LINUX_NCC 19 +#define LINUX_NCC 8 /* Linux termios c_cc values */ #define LINUX_VEOL 1 diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 3efd91a..76cfa4d 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -130,15 +130,8 @@ struct linux_termio { unsigned short c_oflag; unsigned short c_cflag; unsigned short c_lflag; -#ifdef __alpha__ - unsigned char c_cc[LINUX_NCCS]; - unsigned char c_line; - unsigned int c_ispeed; - unsigned int c_ospeed; -#else unsigned char c_line; unsigned char c_cc[LINUX_NCC]; -#endif }; struct linux_termios { @@ -146,8 +139,15 @@ struct linux_termios { unsigned int c_oflag; unsigned int c_cflag; unsigned int c_lflag; +#ifdef __alpha__ + unsigned char c_cc[LINUX_NCCS]; + unsigned char c_line; + unsigned int c_ispeed; + unsigned int c_ospeed; +#else unsigned char c_line; unsigned char c_cc[LINUX_NCCS]; +#endif }; struct linux_winsize { |
