diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-28 15:27:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-28 15:27:45 -0300 |
| commit | 6bf77e770ed9aaba385261c18ec5c8f16a160e20 (patch) | |
| tree | e5376cf1e1c8a9c07221f424e05dc22609427c91 /linux/include/media | |
| parent | c265cca51af88f5caff789df5ead7de8662ccc0f (diff) | |
| parent | 1719eff8a6f088e48ed02067ff1a00577f53d1aa (diff) | |
| download | mediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.gz mediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/tda9887
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/cx2341x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/include/media/cx2341x.h b/linux/include/media/cx2341x.h index 074c4008a..d91d88f93 100644 --- a/linux/include/media/cx2341x.h +++ b/linux/include/media/cx2341x.h @@ -89,9 +89,9 @@ 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); +void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix); /* Firmware names */ #define CX2341X_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw" |