diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 06:42:12 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 06:42:12 -0400 |
| commit | b4ca761577535b2b4d153689ee97342797dfff05 (patch) | |
| tree | 29054d55508f1faa22ec32acf7c245751af03348 /include/linux/file.h | |
| parent | 28f4197e5d4707311febeec8a0eb97cb5fd93c97 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
fs/pipe.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux/file.h')
| -rw-r--r-- | include/linux/file.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/file.h b/include/linux/file.h index 5555508fd51..b1e12970f61 100644 --- a/include/linux/file.h +++ b/include/linux/file.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | struct file; | 12 | struct file; |
| 13 | 13 | ||
| 14 | extern void __fput(struct file *); | ||
| 15 | extern void fput(struct file *); | 14 | extern void fput(struct file *); |
| 16 | extern void drop_file_write_access(struct file *file); | 15 | extern void drop_file_write_access(struct file *file); |
| 17 | 16 | ||