Merge commit 'v2.6.28-rc2' into topic/asoc

1 files changed, 0 insertions, 39 deletions

diff --git a/include/asm-parisc/fcntl.h b/include/asm-parisc/fcntl.h
deleted file mode 100644
index 1e1c824764ee..000000000000
--- a/include/asm-parisc/fcntl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _PARISC_FCNTL_H
-#define _PARISC_FCNTL_H
-
-/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
-   located on an ext2 file system */
-#define O_APPEND        000000010
-#define O_BLKSEEK       000000100 /* HPUX only */
-#define O_CREAT         000000400 /* not fcntl */
-#define O_EXCL          000002000 /* not fcntl */
-#define O_LARGEFILE     000004000
-#define O_SYNC          000100000
-#define O_NONBLOCK      000200004 /* HPUX has separate NDELAY & NONBLOCK */
-#define O_NOCTTY        000400000 /* not fcntl */
-#define O_DSYNC         001000000 /* HPUX only */
-#define O_RSYNC         002000000 /* HPUX only */
-#define O_NOATIME       004000000
-#define O_CLOEXEC       010000000 /* set close_on_exec */
-
-#define O_DIRECTORY     000010000 /* must be a directory */
-#define O_NOFOLLOW      000000200 /* don't follow links */
-#define O_INVISIBLE     004000000 /* invisible I/O, for DMAPI/XDSM */
-
-#define F_GETLK64       8
-#define F_SETLK64       9
-#define F_SETLKW64      10
-
-#define F_GETOWN        11      /*  for sockets. */
-#define F_SETOWN        12      /*  for sockets. */
-#define F_SETSIG        13      /*  for sockets. */
-#define F_GETSIG        14      /*  for sockets. */
-
-/* for posix fcntl() and lockf() */
-#define F_RDLCK         01
-#define F_WRLCK         02
-#define F_UNLCK         03
-
-#include <asm-generic/fcntl.h>
-
-#endif