Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / include / asm-i386 / fcntl.h

diff --git a/include/asm-i386/fcntl.h b/include/asm-i386/fcntl.h
index 01f17d29d2880f10073a651f40554cb18522b15f..46ab12db57397dfc44a7aa84f9c10ac5e97509d9 100644 (file)
--- a/include/asm-i386/fcntl.h
+++ b/include/asm-i386/fcntl.h
@@ -1,18 +1 @@
-#ifndef _I386_FCNTL_H
-#define _I386_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