diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 11:25:31 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 11:25:31 +0200 |
| commit | f78e80209cf143be49f268c340431ae9fa3abb74 (patch) | |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 /include/asm-blackfin/fcntl.h | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff) | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 (diff) | |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'include/asm-blackfin/fcntl.h')
| -rw-r--r-- | include/asm-blackfin/fcntl.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/asm-blackfin/fcntl.h b/include/asm-blackfin/fcntl.h deleted file mode 100644 index 9c403712785..00000000000 --- a/include/asm-blackfin/fcntl.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _BFIN_FCNTL_H -#define _BFIN_FCNTL_H - -/* open/fcntl - O_SYNC is only implemented on blocks devices and on files - located on an ext2 file system */ -#define O_DIRECTORY 040000 /* must be a directory */ -#define O_NOFOLLOW 0100000 /* don't follow links */ -#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ -#define O_LARGEFILE 0400000 - -#include <asm-generic/fcntl.h> - -#endif |