diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/linux/pipe_fs_i.h | |
| parent | 24d01c0681bfbc10a99304c48a89ad213d2d7a4b (diff) | |
| parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) | |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/linux/pipe_fs_i.h')
| -rw-r--r-- | include/linux/pipe_fs_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index c8f038554e80..b43a9e039059 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h | |||
| @@ -152,5 +152,6 @@ void generic_pipe_buf_unmap(struct pipe_inode_info *, struct pipe_buffer *, void | |||
| 152 | void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *); | 152 | void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *); |
| 153 | int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *); | 153 | int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *); |
| 154 | int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *); | 154 | int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *); |
| 155 | void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *); | ||
| 155 | 156 | ||
| 156 | #endif | 157 | #endif |