Merge commit 'upstream/master'

1 files changed, 1 insertions, 35 deletions

diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
index 8a09ca7aa2f2..8b1beae48cd1 100644
--- a/include/asm-sparc64/fcntl.h
+++ b/include/asm-sparc64/fcntl.h
@@ -1,35 +1 @@
-#ifndef _SPARC64_FCNTL_H
-#define _SPARC64_FCNTL_H
-
-/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
-   located on an ext2 file system */
-#define O_NDELAY        0x0004
-#define O_APPEND        0x0008
-#define FASYNC          0x0040  /* fcntl, for BSD compatibility */
-#define O_CREAT         0x0200  /* not fcntl */
-#define O_TRUNC         0x0400  /* not fcntl */
-#define O_EXCL          0x0800  /* not fcntl */
-#define O_SYNC          0x2000
-#define O_NONBLOCK      0x4000
-#define O_NOCTTY        0x8000  /* not fcntl */
-#define O_LARGEFILE     0x40000
-#define O_DIRECT        0x100000 /* direct disk access hint */
-#define O_NOATIME       0x200000
-#define O_CLOEXEC       0x400000
-
-#define F_GETOWN        5       /*  for sockets. */
-#define F_SETOWN        6       /*  for sockets. */
-#define F_GETLK         7
-#define F_SETLK         8
-#define F_SETLKW        9
-
-/* for posix fcntl() and lockf() */
-#define F_RDLCK         1
-#define F_WRLCK         2
-#define F_UNLCK         3
-
-#define __ARCH_FLOCK_PAD        short __unused;
-
-#include <asm-generic/fcntl.h>
-
-#endif /* !(_SPARC64_FCNTL_H) */
+#include <asm-sparc/fcntl.h>