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

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

diff --git a/include/asm-parisc/fcntl.h b/include/asm-parisc/fcntl.h
index 59a54fff7c6362eefd257080119c1a69ac1f5750..317851fa78f3f99b702ba30fff49dea37da728ef 100644 (file)
--- a/include/asm-parisc/fcntl.h
+++ b/include/asm-parisc/fcntl.h
@@ -33,22 +33,6 @@
 #define F_WRLCK                02
 #define F_UNLCK                03
 
-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;
-       loff_t l_start;
-       loff_t l_len;
-       pid_t l_pid;
-};
-
 #include <asm-generic/fcntl.h>
 
 #endif