Merge ARM fixes

[pandora-kernel.git] / include / asm-alpha / fcntl.h

diff --git a/include/asm-alpha/fcntl.h b/include/asm-alpha/fcntl.h
index 3f3ad49..87f2cf4 100644 (file)
--- a/include/asm-alpha/fcntl.h
+++ b/include/asm-alpha/fcntl.h
@@ -10,9 +10,7 @@
 
 #define O_NONBLOCK      00004
 #define O_APPEND        00010
-#define O_NDELAY       O_NONBLOCK
 #define O_SYNC         040000
-#define FASYNC         020000  /* fcntl, for BSD compatibility */
 #define O_DIRECTORY    0100000 /* must be a directory */
 #define O_NOFOLLOW     0200000 /* don't follow links */
 #define O_LARGEFILE    0400000 /* will be set by the kernel on every open */
@@ -39,14 +37,6 @@
 
 #define F_INPROGRESS   64
 
-struct flock {
-       short l_type;
-       short l_whence;
-       __kernel_off_t l_start;
-       __kernel_off_t l_len;
-       __kernel_pid_t l_pid;
-};
-
 #include <asm-generic/fcntl.h>
 
 #endif