summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-17 09:58:22 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:38 +0200
commit6744d1abeb7124c6250f234a0d922ab6d405ab6f (patch)
tree2de8b14e5f048fca4a6ae09191978860aaabcaf3
parent3e4ada1460740300bc76842055251b5abc0007db (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;