diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 18:58:25 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 18:58:25 (GMT) |
| commit | b91867f2ee5c84b550f95ce54c91b180f70f48cb (patch) | |
| tree | bd7a5be4484d539af13e6b345320455e989612cf /drivers/staging/rts5139/rts51x_fop.h | |
| parent | b05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3 (diff) | |
| parent | 9196dc1129fbb3ecf93027224a6bdbc86d086e3a (diff) | |
| download | linux-fsl-qoriq-b91867f2ee5c84b550f95ce54c91b180f70f48cb.tar.xz | |
Merge tag 'staging-3.3-rc3' into staging-next
This was done to resolve some merge issues with the following files that
had changed in both branches:
drivers/staging/rtl8712/rtl871x_sta_mgt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/staging/zcache/zcache-main.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rts5139/rts51x_fop.h')
| -rw-r--r-- | drivers/staging/rts5139/rts51x_fop.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rts5139/rts51x_fop.h b/drivers/staging/rts5139/rts51x_fop.h index 0453f57..94d75f0 100644 --- a/drivers/staging/rts5139/rts51x_fop.h +++ b/drivers/staging/rts5139/rts51x_fop.h @@ -48,7 +48,7 @@ int rts51x_open(struct inode *inode, struct file *filp); int rts51x_release(struct inode *inode, struct file *filp); ssize_t rts51x_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos); -ssize_t rts51x_write(struct file *filp, const char __user * buf, size_t count, +ssize_t rts51x_write(struct file *filp, const char __user *buf, size_t count, loff_t *f_pos); #if 0 /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) */ int rts51x_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, |