diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/alpha/include/asm/fcntl.h | |
parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/alpha/include/asm/fcntl.h')
-rw-r--r-- | arch/alpha/include/asm/fcntl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h index 21b1117a0c61..70145cbb21cb 100644 --- a/arch/alpha/include/asm/fcntl.h +++ b/arch/alpha/include/asm/fcntl.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #define O_NOATIME 04000000 | 16 | #define O_NOATIME 04000000 |
17 | #define O_CLOEXEC 010000000 /* set close_on_exec */ | 17 | #define O_CLOEXEC 010000000 /* set close_on_exec */ |
18 | /* | 18 | /* |
19 | * Before Linux 2.6.32 only O_DSYNC semantics were implemented, but using | 19 | * Before Linux 2.6.33 only O_DSYNC semantics were implemented, but using |
20 | * the O_SYNC flag. We continue to use the existing numerical value | 20 | * the O_SYNC flag. We continue to use the existing numerical value |
21 | * for O_DSYNC semantics now, but using the correct symbolic name for it. | 21 | * for O_DSYNC semantics now, but using the correct symbolic name for it. |
22 | * This new value is used to request true Posix O_SYNC semantics. It is | 22 | * This new value is used to request true Posix O_SYNC semantics. It is |