diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-20 07:41:46 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-20 07:41:46 -0200 |
| commit | 0eff958b90d0ce42359de291796aea7d306793b1 (patch) | |
| tree | 6e695669f22e6204de9e80f0a77769ee79a304a8 /linux/drivers/media/video/pvrusb2 | |
| parent | 48ea5a7999ebf5552ad24bf6b512cbb1ae61126b (diff) | |
| parent | 75cd5f355fe382a2645a959e6ff2beffa09019da (diff) | |
| download | mediapointer-dvb-s2-0eff958b90d0ce42359de291796aea7d306793b1.tar.gz mediapointer-dvb-s2-0eff958b90d0ce42359de291796aea7d306793b1.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/stable
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c index d71bb3dff..6a19264df 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c @@ -141,7 +141,7 @@ static int pvr2_encoder_read_words(struct pvr2_hdw *hdw, cx2341x.ko to write to our encoder (by handing it a pointer to this function). For earlier kernels this doesn't really matter. */ static int pvr2_encoder_cmd(void *ctxt, - int cmd, + u32 cmd, int arg_cnt_send, int arg_cnt_recv, u32 *argp) |