Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/arch/sparc/include/asm/ioctls.h b/arch/sparc/include/asm/ioctls.h
index 53f4ee009bdda24e03e732524b7a16e93fd784bd..ed3807b96bb5aef8d988d4f81bffe60260cbbcd5 100644 (file)
--- a/arch/sparc/include/asm/ioctls.h
+++ b/arch/sparc/include/asm/ioctls.h
@@ -19,6 +19,7 @@
 #define TCSETS2                _IOW('T', 13, struct termios2)
 #define TCSETSW2       _IOW('T', 14, struct termios2)
 #define TCSETSF2       _IOW('T', 15, struct termios2)
+#define TIOCGDEV       _IOR('T',0x32, unsigned int) /* Get primary device node of /dev/console */
 
 /* Note that all the ioctls that are not available in Linux have a 
  * double underscore on the front to: a) avoid some programs to