summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>2011-09-02 10:30:32 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:04:03 +0200
commit5741b0feaa068de2cfdea297300960684e1ce4b2 (patch)
tree6e84960c7ffa63127ab5283c5b9cd0b689a54c02
parent765609b488a2175bd4cfee5cbc25e85cf2b0ebdf (diff)
hdmi: dispdev: Kernel 3.0 migration changes
Add the kernel 3.0 migration changes for dispdev and hdmi drivers ST-Ericsson ID: 352334 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> Change-Id: Ifbc20e018077fb9589e00c658cfdd697437b41ce Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29975
-rw-r--r--drivers/misc/dispdev/dispdev.c2
-rw-r--r--drivers/video/av8100/hdmi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/dispdev/dispdev.c b/drivers/misc/dispdev/dispdev.c
index 00fab078fc3..a8b612bdd26 100644
--- a/drivers/misc/dispdev/dispdev.c
+++ b/drivers/misc/dispdev/dispdev.c
@@ -430,7 +430,7 @@ static int dispdev_dequeue_buffer(struct dispdev *dd)
return i;
}
-int dispdev_ioctl(struct file *file, unsigned int cmd,
+long dispdev_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
int ret;
diff --git a/drivers/video/av8100/hdmi.c b/drivers/video/av8100/hdmi.c
index af9dcfac892..4e6baf59200 100644
--- a/drivers/video/av8100/hdmi.c
+++ b/drivers/video/av8100/hdmi.c
@@ -1747,7 +1747,7 @@ static int hdmi_release(struct inode *inode, struct file *filp)
}
/* ioctl */
-static int hdmi_ioctl(struct file *file,
+static long hdmi_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
u8 value = 0;