aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/include/asm/fcntl.h
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-12-03 13:49:39 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-12-03 13:49:39 +0100
commit220d0b1dbf78c6417a658c96e571415552d3abac (patch)
tree70cd3862540c38ea490e7a27c3c7acc35b680234 /arch/alpha/include/asm/fcntl.h
parentcfq-iosched: no dispatch limit for single queue (diff)
parentLinux 2.6.32 (diff)
downloadlinux-dev-220d0b1dbf78c6417a658c96e571415552d3abac.tar.xz
linux-dev-220d0b1dbf78c6417a658c96e571415552d3abac.zip
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'arch/alpha/include/asm/fcntl.h')
-rw-r--r--arch/alpha/include/asm/fcntl.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h
index e42823e954aa..25da0017ec87 100644
--- a/arch/alpha/include/asm/fcntl.h
+++ b/arch/alpha/include/asm/fcntl.h
@@ -26,8 +26,6 @@
#define F_GETOWN 6 /* for sockets. */
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */
-#define F_SETOWN_EX 12
-#define F_GETOWN_EX 13
/* for posix fcntl() and lockf() */
#define F_RDLCK 1