diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:59:47 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:59:47 +0300 |
commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/parisc/include/asm/fcntl.h | |
parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
download | linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'arch/parisc/include/asm/fcntl.h')
-rw-r--r-- | arch/parisc/include/asm/fcntl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/fcntl.h b/arch/parisc/include/asm/fcntl.h index 5f39d5597ced..1e1c824764ee 100644 --- a/arch/parisc/include/asm/fcntl.h +++ b/arch/parisc/include/asm/fcntl.h @@ -28,8 +28,6 @@ #define F_SETOWN 12 /* for sockets. */ #define F_SETSIG 13 /* for sockets. */ #define F_GETSIG 14 /* for sockets. */ -#define F_GETOWN_EX 15 -#define F_SETOWN_EX 16 /* for posix fcntl() and lockf() */ #define F_RDLCK 01 |