diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-18 14:41:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-22 16:14:03 +0200 |
| commit | e3885851b737f7dbe8dcd4aab823b7acab8a49a4 (patch) | |
| tree | 1dbb16bf5c7f56a0542915da2f0b4ed4235a431d /drivers/mtd/mtdoob.c | |
| parent | b445152396cb6d4ff98f88f294ed00d5f0947cbd (diff) | |
| download | barebox-e3885851b737f7dbe8dcd4aab823b7acab8a49a4.tar.gz barebox-e3885851b737f7dbe8dcd4aab823b7acab8a49a4.tar.xz | |
mtd: rename mtd_read_oob
There is the same function name in the Kernel but with different
semantics. Rename to avoid naming conflicts when we update the
mtd support from the kernel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/mtdoob.c')
| -rw-r--r-- | drivers/mtd/mtdoob.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/mtdoob.c b/drivers/mtd/mtdoob.c index 903138c439..6023302b76 100644 --- a/drivers/mtd/mtdoob.c +++ b/drivers/mtd/mtdoob.c @@ -37,7 +37,7 @@ static struct mtd_info *to_mtd(struct cdev *cdev) return mtdoob->mtd; } -static ssize_t mtd_read_oob(struct cdev *cdev, void *buf, size_t count, +static ssize_t mtd_op_read_oob(struct cdev *cdev, void *buf, size_t count, loff_t _offset, ulong flags) { struct mtd_info *mtd = to_mtd(cdev); @@ -64,7 +64,7 @@ static ssize_t mtd_read_oob(struct cdev *cdev, void *buf, size_t count, } static struct file_operations mtd_ops_oob = { - .read = mtd_read_oob, + .read = mtd_op_read_oob, .ioctl = mtd_ioctl, .lseek = dev_lseek_default, }; |