diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 23:15:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 23:15:45 -0400 |
| commit | a3470171d69d5526a01c31f1ce4a1e8090b6e5d9 (patch) | |
| tree | a4a69bb1bcf84ca90749e835c50e38f3de1e7fd2 /include | |
| parent | cf8dc57cbac0fe089308f57c333ab763c36782ff (diff) | |
| parent | 6f6b3940ed326eed58074d777ab92fda3a60a382 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] vmlinux.lds.S: Handle note sections
[MIPS] Fix value of O_TRUNC
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/fcntl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h index 00a50ec1c19f..2a52333a062d 100644 --- a/include/asm-mips/fcntl.h +++ b/include/asm-mips/fcntl.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #define O_SYNC 0x0010 | 13 | #define O_SYNC 0x0010 |
| 14 | #define O_NONBLOCK 0x0080 | 14 | #define O_NONBLOCK 0x0080 |
| 15 | #define O_CREAT 0x0100 /* not fcntl */ | 15 | #define O_CREAT 0x0100 /* not fcntl */ |
| 16 | #define O_TRUNC 0x0200 /* not fcntl */ | ||
| 16 | #define O_EXCL 0x0400 /* not fcntl */ | 17 | #define O_EXCL 0x0400 /* not fcntl */ |
| 17 | #define O_NOCTTY 0x0800 /* not fcntl */ | 18 | #define O_NOCTTY 0x0800 /* not fcntl */ |
| 18 | #define FASYNC 0x1000 /* fcntl, for BSD compatibility */ | 19 | #define FASYNC 0x1000 /* fcntl, for BSD compatibility */ |