diff options
author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
---|---|---|
committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
tree | 6067ea700202750ba335a423696f2972700e5f76 /include/asm-mips/ioctls.h | |
parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'include/asm-mips/ioctls.h')
-rw-r--r-- | include/asm-mips/ioctls.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-mips/ioctls.h b/include/asm-mips/ioctls.h index 5648eae7f..c0c3d2dad 100644 --- a/include/asm-mips/ioctls.h +++ b/include/asm-mips/ioctls.h @@ -96,8 +96,10 @@ #define TCSBRKP 0x5486 /* Needed for POSIX tcsendbreak() */ #define TIOCTTYGSTRUCT 0x5487 /* For debugging only */ +#ifdef WHAT_TO_DO_WITH_THIS_DULPLICATE #define TIOCSBRK 0x5427 /* BSD compatibility */ #define TIOCCBRK 0x5428 /* BSD compatibility */ +#endif #define TIOCSERCONFIG 0x5488 #define TIOCSERGWILD 0x5489 @@ -110,5 +112,7 @@ #define TIOCSERSETMULTI 0x5490 /* Set multiport config */ #define TIOCMIWAIT 0x5491 /* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x5492 /* read serial port inline interrupt counts */ +#define TIOCSBRK 0x5491 /* BSD compatibility */ +#define TIOCCBRK 0x5492 /* BSD compatibility */ #endif /* __ASM_MIPS_IOCTLS_H */ |