Pull battery into release branch

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / termbits.h

diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h
index b572f21b32c4b188a6f250303cece2256f8531e7..6698188ca550aabc84ecadb7b0e7019be336734d 100644 (file)
--- a/include/asm-powerpc/termbits.h
+++ b/include/asm-powerpc/termbits.h
@@ -37,8 +37,8 @@ struct ktermios {
        tcflag_t c_oflag;               /* output mode flags */
        tcflag_t c_cflag;               /* control mode flags */
        tcflag_t c_lflag;               /* local mode flags */
-       cc_t c_line;                    /* line discipline */
        cc_t c_cc[NCCS];                /* control characters */
+       cc_t c_line;                    /* line discipline (== c_cc[19]) */
        speed_t c_ispeed;               /* input speed */
        speed_t c_ospeed;               /* output speed */
 };
@@ -152,6 +152,10 @@ struct ktermios {
 #define B3000000  00034
 #define B3500000  00035
 #define B4000000  00036
+#define   BOTHER  00037
+
+#define CIBAUD 077600000
+#define IBSHIFT        16              /* Shift from CBAUD to CIBAUD */
 
 #define CSIZE  00001400
 #define   CS5  00000000