diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-24 12:18:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-24 12:18:19 -0300 |
| commit | 69401b0f639b2b138b6dc58ba75ef2dcbd9c0db0 (patch) | |
| tree | a198aeff7654bd3990ab20ca230829fc0f14b4e6 /linux/include | |
| parent | c2b360cb71e99d5c5f9c12330e57cedb39336244 (diff) | |
| parent | baf3ec2b0712d5ee96a8fe4e9dc4ad7a7a128124 (diff) | |
| download | mediapointer-dvb-s2-69401b0f639b2b138b6dc58ba75ef2dcbd9c0db0.tar.gz mediapointer-dvb-s2-69401b0f639b2b138b6dc58ba75ef2dcbd9c0db0.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
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 38c12fed7..af8071d76 100644 --- a/linux/include/media/cx2341x.h +++ b/linux/include/media/cx2341x.h @@ -91,7 +91,7 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func, 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, +int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy, 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, const char *prefix); |