[PATCH] UML: add generic BUG support

[linux-2.6] / include / asm-mips / termbits.h

diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h
index c29c65b7818e09cfae1ca48d66a09a83cd564070..b62ec7c521cc3807793aa552e41fc0a20591c6ba 100644 (file)
--- a/include/asm-mips/termbits.h
+++ b/include/asm-mips/termbits.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995, 1996, 1999, 2001 Ralf Baechle
+ * Copyright (C) 1995, 96, 99, 2001, 06 Ralf Baechle
  * Copyright (C) 1999 Silicon Graphics, Inc.
  * Copyright (C) 2001 MIPS Technologies, Inc.
  */
@@ -13,14 +13,8 @@
 #include <linux/posix_types.h>
 
 typedef unsigned char cc_t;
-#if (_MIPS_SZLONG == 32)
-typedef unsigned long speed_t;
-typedef unsigned long tcflag_t;
-#endif
-#if (_MIPS_SZLONG == 64)
-typedef __u32 speed_t;
-typedef __u32 tcflag_t;
-#endif
+typedef unsigned int speed_t;
+typedef unsigned int tcflag_t;
 
 /*
  * The ABI says nothing about NCC but seems to use NCCS as
@@ -77,7 +71,7 @@ struct termios {
 #define IXANY  0004000         /* Any character will restart after stop.  */
 #define IXOFF  0010000         /* Enable start/stop input control.  */
 #define IMAXBEL        0020000         /* Ring bell when input queue is full.  */
-#define IUTF8  0040000         /* Input is UTF8 */
+#define IUTF8  0040000         /* Input is UTF-8 */
 
 /* c_oflag bits */
 #define OPOST  0000001         /* Perform output processing.  */