summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-17 09:58:22 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-17 13:42:19 +0200
commitf83283a3d3e42266b8b74f5347cae5bdaad2b7b7 (patch)
tree8ebbed8ec66315b17029f2d8fb276232bb22e28d
parentdc17359937a07796fe19dd3a0d3b83fc411198f8 (diff)
ux500: mmio: Fix 2.6.38 ioctl portingGLK-2.6.38_w125.1
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;