diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:58:32 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:58:32 +0200 |
commit | a3251562dbdc8dda29da84ac1ab271e927dc8ae0 (patch) | |
tree | 8335db3837ca1a04dc81730c0a40e4edbf467179 /drivers/mfd/mc34704.c | |
parent | 9d0b51ea7e5b3fece57f91e17349b79a5b4b37e7 (diff) | |
parent | cfcfc66d5486c2061316ebcdf32ef2f1ecbda433 (diff) | |
download | barebox-a3251562dbdc8dda29da84ac1ab271e927dc8ae0.tar.gz barebox-a3251562dbdc8dda29da84ac1ab271e927dc8ae0.tar.xz |
Merge branch 'for-next/64bit'
Diffstat (limited to 'drivers/mfd/mc34704.c')
-rw-r--r-- | drivers/mfd/mc34704.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/mc34704.c b/drivers/mfd/mc34704.c index a2171b35d1..20c01e2be6 100644 --- a/drivers/mfd/mc34704.c +++ b/drivers/mfd/mc34704.c @@ -65,7 +65,7 @@ int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val) EXPORT_SYMBOL(mc34704_reg_write) static ssize_t mc34704_read(struct cdev *cdev, void *_buf, size_t count, - ulong offset, ulong flags) + loff_t offset, ulong flags) { struct mc34704 *priv = to_mc34704(cdev); u8 *buf = _buf; @@ -85,7 +85,7 @@ static ssize_t mc34704_read(struct cdev *cdev, void *_buf, size_t count, } static ssize_t mc34704_write(struct cdev *cdev, const void *_buf, size_t count, - ulong offset, ulong flags) + loff_t offset, ulong flags) { struct mc34704 *mc34704 = to_mc34704(cdev); const u8 *buf = _buf; |