diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-06-26 19:27:29 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-06-26 19:27:29 +0200 |
| commit | 630df645af9c5f22d032d768942fb03f584cbec7 (patch) | |
| tree | 0e41ceeed41ba48e2c94345bfb3d7a7ae746006c /linux/include | |
| parent | e16f996182d00ebc29e5bfc9bacd24943b814b5b (diff) | |
| parent | 78b6dfe3d0f7e5d17ce931cf67307a174188a794 (diff) | |
| download | mediapointer-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/include')
| -rw-r--r-- | linux/include/media/cx2341x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/media/cx2341x.h b/linux/include/media/cx2341x.h index 074c4008a..e1cbf7974 100644 --- a/linux/include/media/cx2341x.h +++ b/linux/include/media/cx2341x.h @@ -89,7 +89,7 @@ int cx2341x_ctrl_query(struct cx2341x_mpeg_params *params, struct v4l2_queryctrl *qctrl); const char **cx2341x_ctrl_get_menu(u32 id); int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, - struct v4l2_ext_controls *ctrls, int cmd); + struct v4l2_ext_controls *ctrls, unsigned int cmd); void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p); void cx2341x_log_status(struct cx2341x_mpeg_params *p, int cardid); |