Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[powerpc.git] / include / asm-cris / fcntl.h

diff --git a/include/asm-cris/fcntl.h b/include/asm-cris/fcntl.h
index f8e7d13..46ab12d 100644 (file)
--- a/include/asm-cris/fcntl.h
+++ b/include/asm-cris/fcntl.h
@@ -1,18 +1 @@
-#ifndef _CRIS_FCNTL_H
-#define _CRIS_FCNTL_H
-
-#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