diff options
| author | Palash Bandyopadhyay <palash.bandyopadhyay@conexant.com> | 2010-07-06 18:12:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:10 -0200 |
| commit | 64fbf44455260684fa5bfdd3121af3d0ef0b48dd (patch) | |
| tree | 3e823c84d187b8de0731cd0b703b341abd92350e /drivers/media/video/cx231xx/cx231xx-vbi.h | |
| parent | 47b75ec14653f12f9fd6fd76bfd5891ba35e1e79 (diff) | |
| download | kernel_samsung_crespo-64fbf44455260684fa5bfdd3121af3d0ef0b48dd.zip kernel_samsung_crespo-64fbf44455260684fa5bfdd3121af3d0ef0b48dd.tar.gz kernel_samsung_crespo-64fbf44455260684fa5bfdd3121af3d0ef0b48dd.tar.bz2 | |
[media] cx231xx: Added support for Carraera, Shelby, RDx_253S and VIDEO_GRABBER
Added support for new cx231xx boards - Carraera, Shelby, RDx_253S and
VIDEO_GRABBER.
[mchehab@redhat.com: Fix a merge conflict with BKL removal patches]
Signed-off-by: Palash Bandyopadhyay <palash.bandyopadhyay@conexant.com>
Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-vbi.h')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-vbi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.h b/drivers/media/video/cx231xx/cx231xx-vbi.h index 89c7fe8..16c7d20 100644 --- a/drivers/media/video/cx231xx/cx231xx-vbi.h +++ b/drivers/media/video/cx231xx/cx231xx-vbi.h @@ -41,7 +41,7 @@ extern struct videobuf_queue_ops cx231xx_vbi_qops; /* stream functions */ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets, int num_bufs, int max_pkt_size, - int (*isoc_copy) (struct cx231xx *dev, + int (*bulk_copy) (struct cx231xx *dev, struct urb *urb)); void cx231xx_uninit_vbi_isoc(struct cx231xx *dev); |