Merge branch 'master' into tk71

[mv-sheeva.git] / include / asm-generic / ioctls.h

diff --git a/include/asm-generic/ioctls.h b/include/asm-generic/ioctls.h
index 8554cb6a81b9b6f3e063d204d6da830f6ed0038a..3f3f2d189fb86d3cd6cb5c93b8e45cef6d6e954a 100644 (file)
--- a/include/asm-generic/ioctls.h
+++ b/include/asm-generic/ioctls.h
@@ -62,9 +62,12 @@
 #define TCSETSW2       _IOW('T', 0x2C, struct termios2)
 #define TCSETSF2       _IOW('T', 0x2D, struct termios2)
 #define TIOCGRS485     0x542E
+#ifndef TIOCSRS485
 #define TIOCSRS485     0x542F
+#endif
 #define TIOCGPTN       _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK     _IOW('T', 0x31, int)  /* Lock/unlock Pty */
+#define TIOCGDEV       _IOR('T', 0x32, unsigned int) /* Get primary device node of /dev/console */
 #define TCGETX         0x5432 /* SYS5 TCGETX compatibility */
 #define TCSETX         0x5433
 #define TCSETXF                0x5434