summaryrefslogtreecommitdiffstats
path: root/drivers/net/miidev.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:58:32 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:58:32 +0200
commita3251562dbdc8dda29da84ac1ab271e927dc8ae0 (patch)
tree8335db3837ca1a04dc81730c0a40e4edbf467179 /drivers/net/miidev.c
parent9d0b51ea7e5b3fece57f91e17349b79a5b4b37e7 (diff)
parentcfcfc66d5486c2061316ebcdf32ef2f1ecbda433 (diff)
downloadbarebox-a3251562dbdc8dda29da84ac1ab271e927dc8ae0.tar.gz
barebox-a3251562dbdc8dda29da84ac1ab271e927dc8ae0.tar.xz
Merge branch 'for-next/64bit'
Diffstat (limited to 'drivers/net/miidev.c')
-rw-r--r--drivers/net/miidev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/miidev.c b/drivers/net/miidev.c
index f47fc9e65b..d23775b5a4 100644
--- a/drivers/net/miidev.c
+++ b/drivers/net/miidev.c
@@ -180,7 +180,7 @@ int miidev_print_status(struct mii_device *mdev)
return 0;
}
-static ssize_t miidev_read(struct cdev *cdev, void *_buf, size_t count, ulong offset, ulong flags)
+static ssize_t miidev_read(struct cdev *cdev, void *_buf, size_t count, loff_t offset, ulong flags)
{
int i = count;
uint16_t *buf = _buf;
@@ -196,7 +196,7 @@ static ssize_t miidev_read(struct cdev *cdev, void *_buf, size_t count, ulong of
return count;
}
-static ssize_t miidev_write(struct cdev *cdev, const void *_buf, size_t count, ulong offset, ulong flags)
+static ssize_t miidev_write(struct cdev *cdev, const void *_buf, size_t count, loff_t offset, ulong flags)
{
int i = count;
const uint16_t *buf = _buf;