git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
fcntl.h
diff --git
a/arch/alpha/include/asm/fcntl.h
b/arch/alpha/include/asm/fcntl.h
index
1b71ca7
..
6d9e805
100644
(file)
--- a/
arch/alpha/include/asm/fcntl.h
+++ b/
arch/alpha/include/asm/fcntl.h
@@
-51,8
+51,6
@@
#define F_EXLCK 16 /* or 3 */
#define F_SHLCK 32 /* or 4 */
-#define F_INPROGRESS 64
-
#include <asm-generic/fcntl.h>
#endif