diff options
author | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
tree | 962e068491b752a944f61c454fad3f8619a1ea3f /include/asm-sparc/ioctls.h | |
parent | [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash (diff) | |
parent | slab_err: Pass parameters correctly to slab_bug (diff) | |
download | linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz linux-36d99df2fb474222ab47fbe8ae7385661033223b.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc/ioctls.h')
-rw-r--r-- | include/asm-sparc/ioctls.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc/ioctls.h b/include/asm-sparc/ioctls.h index 058c2064f706..3f4d0087b6a3 100644 --- a/include/asm-sparc/ioctls.h +++ b/include/asm-sparc/ioctls.h @@ -43,8 +43,6 @@ #define __TIOCSETX _IOW('t', 34, int) /* SunOS Specific */ #define __TIOCGETX _IOR('t', 35, int) /* SunOS Specific */ #define TIOCCONS _IO('t', 36) -#define __TIOCSSIZE _IOW('t', 37, struct sunos_ttysize) /* SunOS Specific */ -#define __TIOCGSIZE _IOR('t', 38, struct sunos_ttysize) /* SunOS Specific */ #define TIOCGSOFTCAR _IOR('t', 100, int) #define TIOCSSOFTCAR _IOW('t', 101, int) #define __TIOCUCNTL _IOW('t', 102, int) /* SunOS Specific */ |