X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fbttvp.h;fp=drivers%2Fmedia%2Fvideo%2Fbt8xx%2Fbttvp.h;h=9cb72f176f7da705e1f82d85e3e40fff912c9bf6;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=ee989d2e15d9ede516d1ff51113f7c6a64a29809;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bttvp.h
similarity index 98%
rename from drivers/media/video/bt8xx/bttvp.h
rename to drivers/media/video/bttvp.h
index ee989d2e1..9cb72f176 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -41,6 +41,7 @@
 
 #include <linux/device.h>
 #include <media/video-buf.h>
+#include <media/audiochip.h>
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
@@ -189,8 +190,7 @@ int bttv_buffer_activate_video(struct bttv *btv,
 			       struct bttv_buffer_set *set);
 int bttv_buffer_activate_vbi(struct bttv *btv,
 			     struct bttv_buffer *vbi);
-void bttv_dma_free(struct videobuf_queue *q, struct bttv *btv,
-		   struct bttv_buffer *buf);
+void bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf);
 
 /* overlay handling */
 int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
@@ -298,8 +298,6 @@ struct bttv {
 	int                        i2c_state, i2c_rc;
 	int                        i2c_done;
 	wait_queue_head_t          i2c_queue;
-	struct i2c_client 	  *i2c_msp34xx_client;
-	struct i2c_client 	  *i2c_tvaudio_client;
 
 	/* video4linux (1) */
 	struct video_device *video_dev;
@@ -322,7 +320,6 @@ struct bttv {
 	/* video state */
 	unsigned int input;
 	unsigned int audio;
-	unsigned int mute;
 	unsigned long freq;
 	int tvnorm,hue,contrast,bright,saturation;
 	struct v4l2_framebuffer fbuf;