diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-06 18:18:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:38 -0400 |
commit | 5ac353f9baf7169298ebb7de86b2d697b25bca44 (patch) | |
tree | 2591e241e07c96d19db85d418ff6623ec394f984 /include/asm-arm26 | |
parent | 1abf62afb6e9cdc1b2618b69067a186b94281587 (diff) |
[PATCH] Clean up struct flock definitions
This patch just gathers together all the struct flock definitions except
xtensa into asm-generic/fcntl.h.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-arm26')
-rw-r--r-- | include/asm-arm26/fcntl.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-arm26/fcntl.h b/include/asm-arm26/fcntl.h index 2f08302fa8c6..b88f8d08c60c 100644 --- a/include/asm-arm26/fcntl.h +++ b/include/asm-arm26/fcntl.h | |||
@@ -12,14 +12,6 @@ | |||
12 | #define F_SETLK64 13 | 12 | #define F_SETLK64 13 |
13 | #define F_SETLKW64 14 | 13 | #define F_SETLKW64 14 |
14 | 14 | ||
15 | struct flock { | ||
16 | short l_type; | ||
17 | short l_whence; | ||
18 | off_t l_start; | ||
19 | off_t l_len; | ||
20 | pid_t l_pid; | ||
21 | }; | ||
22 | |||
23 | struct flock64 { | 15 | struct flock64 { |
24 | short l_type; | 16 | short l_type; |
25 | short l_whence; | 17 | short l_whence; |