Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / media / video / cx231xx / cx231xx-vbi.h

diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.h b/drivers/media/video/cx231xx/cx231xx-vbi.h
index 89c7fe80b2617f30c6f4dbdf7818819dfcc181e9..16c7d20a22a4a79b6107f4e9245e3fb67b6fb5ed 100644 (file)
--- 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);