summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-17 09:58:22 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:54 +0200
commit821308fa3824e39b05e6e76b42b645c7734be54f (patch)
tree977f4368b06d8b5ec35015a590a89a7fae2d7177
parentec8f5c355f97153a0adcf9370b8b3cf468aef74a (diff)
ux500: mmio: Fix 2.6.38 ioctl porting
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--drivers/staging/mmio/st_mmio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/mmio/st_mmio.c b/drivers/staging/mmio/st_mmio.c
index 1dc82a9671b..b7f2cc997e6 100644
--- a/drivers/staging/mmio/st_mmio.c
+++ b/drivers/staging/mmio/st_mmio.c
@@ -513,7 +513,7 @@ out:
return ret;
}
-static int mmio_ioctl(struct inode *node, struct file *filp, u32 cmd,
+static long mmio_ioctl(struct file *filp, u32 cmd,
unsigned long arg)
{
struct mmio_input_output_t data;