[PATCH] Clean up struct flock definitions

This patch just gathers together all the struct flock definitions except
xtensa into asm-generic/fcntl.h.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 0 insertions, 10 deletions

diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h
index 8549c0332c98..4480f21bfdea 100644
--- a/include/asm-ppc/fcntl.h
+++ b/include/asm-ppc/fcntl.h
@@ -10,17 +10,7 @@
 #define F_GETLK64       12      /*  using 'struct flock64' */
 #define F_SETLK64       13
 #define F_SETLKW64      14
-#endif
-
-struct flock {
-        short l_type;
-        short l_whence;
-        off_t l_start;
-        off_t l_len;
-        pid_t l_pid;
-};
 
-#ifndef __powerpc64__
 struct flock64 {
         short  l_type;
         short  l_whence;