git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
video
/
bttvp.h
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
ee989d2
..
9cb72f1
100644
(file)
--- 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 <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>
#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);
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,
/* 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;
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;
/* video4linux (1) */
struct video_device *video_dev;
@@
-322,7
+320,6
@@
struct bttv {
/* video state */
unsigned int input;
unsigned int audio;
/* video state */
unsigned int input;
unsigned int audio;
- unsigned int mute;
unsigned long freq;
int tvnorm,hue,contrast,bright,saturation;
struct v4l2_framebuffer fbuf;
unsigned long freq;
int tvnorm,hue,contrast,bright,saturation;
struct v4l2_framebuffer fbuf;