Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / arch / cris / include / asm / ioctls.h

diff --git a/arch/cris/include/asm/ioctls.h b/arch/cris/include/asm/ioctls.h
index 35bbc18..c9129ed 100644 (file)
--- a/arch/cris/include/asm/ioctls.h
+++ b/arch/cris/include/asm/ioctls.h
@@ -54,6 +54,7 @@
 #define TCSETSF2       _IOW('T',0x2D, struct termios2)
 #define TIOCGPTN       _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK     _IOW('T',0x31, int)  /* Lock/unlock Pty */
+#define TIOCSIG                _IOW('T',0x36, int)  /* Generate signal on Pty slave */
 
 #define FIONCLEX       0x5450  /* these numbers need to be adjusted. */
 #define FIOCLEX                0x5451
@@ -70,13 +71,12 @@
 
 #define TIOCMIWAIT     0x545C  /* wait for a change on serial input line(s) */
 #define TIOCGICOUNT    0x545D  /* read serial port inline interrupt counts */
-#define TIOCGHAYESESP   0x545E  /* Get Hayes ESP configuration */
-#define TIOCSHAYESESP   0x545F  /* Set Hayes ESP configuration */
 #define FIOQSIZE       0x5460
 
 #define TIOCSERSETRS485        0x5461  /* enable rs-485 (deprecated) */
 #define TIOCSERWRRS485 0x5462  /* write rs-485 */
 #define TIOCSRS485     0x5463  /* enable rs-485 */
+#define TIOCGRS485     0x542E  /* get rs-485 */
 
 /* Used for packet mode */
 #define TIOCPKT_DATA            0
@@ -86,6 +86,7 @@
 #define TIOCPKT_START           8
 #define TIOCPKT_NOSTOP         16
 #define TIOCPKT_DOSTOP         32
+#define TIOCPKT_IOCTL          64
 
 #define TIOCSER_TEMT    0x01   /* Transmitter physically empty */