summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx2341x.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-06-26 19:27:29 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2006-06-26 19:27:29 +0200
commit630df645af9c5f22d032d768942fb03f584cbec7 (patch)
tree0e41ceeed41ba48e2c94345bfb3d7a7ae746006c /linux/drivers/media/video/cx2341x.c
parente16f996182d00ebc29e5bfc9bacd24943b814b5b (diff)
parent78b6dfe3d0f7e5d17ce931cf67307a174188a794 (diff)
downloadmediapointer-dvb-s2-630df645af9c5f22d032d768942fb03f584cbec7.tar.gz
mediapointer-dvb-s2-630df645af9c5f22d032d768942fb03f584cbec7.tar.bz2
Merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx2341x.c')
-rw-r--r--linux/drivers/media/video/cx2341x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx2341x.c b/linux/drivers/media/video/cx2341x.c
index ae37d0513..7bb1fb4ee 100644
--- a/linux/drivers/media/video/cx2341x.c
+++ b/linux/drivers/media/video/cx2341x.c
@@ -605,7 +605,7 @@ static void cx2341x_calc_audio_properties(struct cx2341x_mpeg_params *params)
}
int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params,
- struct v4l2_ext_controls *ctrls, int cmd)
+ struct v4l2_ext_controls *ctrls, unsigned int cmd)
{
int err = 0;
int i;