diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index cfa8668784b4..326a25f147f6 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #include <media/tuner.h> | 28 | #include <media/tuner.h> |
29 | #include <media/tveeprom.h> | 29 | #include <media/tveeprom.h> |
30 | #include <media/audiochip.h> | ||
31 | #include <media/video-buf.h> | 30 | #include <media/video-buf.h> |
32 | #include <media/video-buf-dvb.h> | 31 | #include <media/video-buf-dvb.h> |
33 | 32 | ||
@@ -485,7 +484,7 @@ extern int | |||
485 | cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc, | 484 | cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc, |
486 | u32 reg, u32 mask, u32 value); | 485 | u32 reg, u32 mask, u32 value); |
487 | extern void | 486 | extern void |
488 | cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf); | 487 | cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf); |
489 | 488 | ||
490 | extern void cx88_risc_disasm(struct cx88_core *core, | 489 | extern void cx88_risc_disasm(struct cx88_core *core, |
491 | struct btcx_riscmem *risc); | 490 | struct btcx_riscmem *risc); |
@@ -577,8 +576,8 @@ void cx88_ir_irq(struct cx88_core *core); | |||
577 | /* ----------------------------------------------------------- */ | 576 | /* ----------------------------------------------------------- */ |
578 | /* cx88-mpeg.c */ | 577 | /* cx88-mpeg.c */ |
579 | 578 | ||
580 | int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf, | 579 | int cx8802_buf_prepare(struct videobuf_queue *q,struct cx8802_dev *dev, |
581 | enum v4l2_field field); | 580 | struct cx88_buffer *buf, enum v4l2_field field); |
582 | void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf); | 581 | void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf); |
583 | void cx8802_cancel_buffers(struct cx8802_dev *dev); | 582 | void cx8802_cancel_buffers(struct cx8802_dev *dev); |
584 | 583 | ||