[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, 12 deletions

diff --git a/include/asm-m32r/fcntl.h b/include/asm-m32r/fcntl.h
index ff3a0849bb85..90f71735fa9a 100644
--- a/include/asm-m32r/fcntl.h
+++ b/include/asm-m32r/fcntl.h
@@ -1,22 +1,10 @@
 #ifndef _ASM_M32R_FCNTL_H
 #define _ASM_M32R_FCNTL_H
 
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 #define F_GETLK64       12      /*  using 'struct flock64' */
 #define F_SETLK64       13
 #define F_SETLKW64      14
 
-struct flock {
-        short l_type;
-        short l_whence;
-        off_t l_start;
-        off_t l_len;
-        pid_t l_pid;
-};
-
 struct flock64 {
         short  l_type;
         short  l_whence;