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

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

diff --git a/include/asm-x86_64/fcntl.h b/include/asm-x86_64/fcntl.h
index c7b09ea..46ab12d 100644 (file)
--- a/include/asm-x86_64/fcntl.h
+++ b/include/asm-x86_64/fcntl.h
@@ -1,14 +1 @@
-#ifndef _X86_64_FCNTL_H
-#define _X86_64_FCNTL_H
-
-struct flock {
-       short  l_type;
-       short  l_whence;
-       off_t l_start;
-       off_t l_len;
-       pid_t  l_pid;
-};
-
 #include <asm-generic/fcntl.h>
-
-#endif /* !_X86_64_FCNTL_H */