summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/msp3400-driver.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-23 11:08:23 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-23 11:08:23 -0200
commitd8fa5b2669acb99dcbc246d93bef9f2028c1aff0 (patch)
treeeed27148019ac67d7c352d069af678e30efec417 /linux/drivers/media/video/msp3400-driver.c
parent43cea8a5c34e5756adad03ee6522853203b48433 (diff)
parentbba7ba66b44e9f98fbf2c6019be85b8448f0a3a7 (diff)
downloadmediapointer-dvb-s2-d8fa5b2669acb99dcbc246d93bef9f2028c1aff0.tar.gz
mediapointer-dvb-s2-d8fa5b2669acb99dcbc246d93bef9f2028c1aff0.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/msp3400-driver.c')
-rw-r--r--linux/drivers/media/video/msp3400-driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index def15e381..9d2c98b82 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -488,7 +488,7 @@ static int msp_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
}
#ifdef CONFIG_VIDEO_ALLOW_V4L1
-static int msp_ioctl(struct v4l2_subdev *sd, int cmd, void *arg)
+static int msp_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
{
struct msp_state *state = to_state(sd);
struct i2c_client *client = v4l2_get_subdevdata(sd);