Merge branch '3.10-fixes' into mips-for-linux-next

[pandora-kernel.git] / arch / mips / include / uapi / asm / fcntl.h

diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h
index 6e9e746..6ca432f 100644 (file)
--- a/arch/mips/include/uapi/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
@@ -5,8 +5,8 @@
  *
  * Copyright (C) 1995, 96, 97, 98, 99, 2003, 05 Ralf Baechle
  */
-#ifndef _ASM_FCNTL_H
-#define _ASM_FCNTL_H
+#ifndef _UAPI_ASM_FCNTL_H
+#define _UAPI_ASM_FCNTL_H
 
 #include <asm/sgidefs.h>
 
@@ -63,8 +63,8 @@
 struct flock {
        short   l_type;
        short   l_whence;
-       off_t   l_start;
-       off_t   l_len;
+       __kernel_off_t  l_start;
+       __kernel_off_t  l_len;
        long    l_sysid;
        __kernel_pid_t l_pid;
        long    pad[4];
@@ -76,4 +76,4 @@ struct flock {
 
 #include <asm-generic/fcntl.h>
 
-#endif /* _ASM_FCNTL_H */
+#endif /* _UAPI_ASM_FCNTL_H */