Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / include / asm-arm / fcntl.h

diff --git a/include/asm-arm/fcntl.h b/include/asm-arm/fcntl.h
index 1816a6ac6f10cc1e3bab6c93a42c47e9e5bcaa39..a80b6607b2efe35281d476d852e106cd3d6ca31b 100644 (file)
--- a/include/asm-arm/fcntl.h
+++ b/include/asm-arm/fcntl.h
@@ -6,18 +6,6 @@
 #define O_DIRECT       0200000 /* direct disk access hint - currently ignored */
 #define O_LARGEFILE    0400000
 
-#define F_GETLK64      12      /*  using 'struct flock64' */
-#define F_SETLK64      13
-#define F_SETLKW64     14
-
-struct flock64 {
-       short  l_type;
-       short  l_whence;
-       loff_t l_start;
-       loff_t l_len;
-       pid_t  l_pid;
-};
-
 #include <asm-generic/fcntl.h>
 
 #endif