diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 03:36:17 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 03:36:17 -0500 |
| commit | 0e44e059588e1d91f3a1974d2ce3348864d1d799 (patch) | |
| tree | 1161c2508bd9eeab010ebc40ef87860fd85a35fd /include/linux/pipe_fs_i.h | |
| parent | 96886c4361f1ae3f6c775d7c9295e2d557101d0f (diff) | |
| parent | e8a7e48bb248a1196484d3f8afa53bded2b24e71 (diff) | |
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 445796945ac9..bb27d7ec2fb9 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h | |||
| @@ -160,5 +160,6 @@ void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *); | |||
| 160 | 160 | ||
| 161 | /* for F_SETPIPE_SZ and F_GETPIPE_SZ */ | 161 | /* for F_SETPIPE_SZ and F_GETPIPE_SZ */ |
| 162 | long pipe_fcntl(struct file *, unsigned int, unsigned long arg); | 162 | long pipe_fcntl(struct file *, unsigned int, unsigned long arg); |
| 163 | struct pipe_inode_info *get_pipe_info(struct file *file); | ||
| 163 | 164 | ||
| 164 | #endif | 165 | #endif |