Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / include / asm-ia64 / fcntl.h

diff --git a/include/asm-ia64/fcntl.h b/include/asm-ia64/fcntl.h
index a9d04aca7903726af7db7b653d2f8096767689f4..1dd275dc8f653a0b6be00f469998bfa8711044a0 100644 (file)
--- a/include/asm-ia64/fcntl.h
+++ b/include/asm-ia64/fcntl.h
@@ -5,14 +5,6 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
  */
 
-struct flock {
-       short l_type;
-       short l_whence;
-       off_t l_start;
-       off_t l_len;
-       pid_t l_pid;
-};
-
 #define force_o_largefile()    \
                (personality(current->personality) != PER_LINUX32)