X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fasm-s390%2Ffcntl.h;h=46ab12db57397dfc44a7aa84f9c10ac5e97509d9;hb=7e33db4e2e9d67ee01d105e33fb773eed8ba10f0;hp=2974433e8ea4052ab45a1b9cbdd52f9c6dc54bdf;hpb=1abf62afb6e9cdc1b2618b69067a186b94281587;p=~andy%2Flinux

diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h
index 2974433e8ea..46ab12db573 100644
--- a/include/asm-s390/fcntl.h
+++ b/include/asm-s390/fcntl.h
@@ -1,37 +1 @@
-/*
- *  include/asm-s390/fcntl.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/fcntl.h"
- */
-#ifndef _S390_FCNTL_H
-#define _S390_FCNTL_H
-
-#ifndef __s390x__
-#define F_GETLK64	12	/*  using 'struct flock64' */
-#define F_SETLK64	13
-#define F_SETLKW64	14
-#endif /* ! __s390x__ */
-
-struct flock {
-	short l_type;
-	short l_whence;
-	off_t l_start;
-	off_t l_len;
-	pid_t l_pid;
-};
-
-#ifndef __s390x__
-struct flock64 {
-	short  l_type;
-	short  l_whence;
-	loff_t l_start;
-	loff_t l_len;
-	pid_t  l_pid;
-};
-#endif
-
 #include <asm-generic/fcntl.h>
-
-#endif