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
/
tda9875.c
diff --git
a/drivers/media/video/tda9875.c
b/drivers/media/video/tda9875.c
index
103ccb9
..
ef98c49
100644
(file)
--- a/
drivers/media/video/tda9875.c
+++ b/
drivers/media/video/tda9875.c
@@
-30,22
+30,24
@@
#include <linux/i2c-algo-bit.h>
#include <linux/init.h>
#include <linux/i2c-algo-bit.h>
#include <linux/init.h>
-
-#include <media/
i2c-addr
.h>
+#include "bttv.h"
+#include <media/
audiochip
.h>
static int debug; /* insmod parameter */
module_param(debug, int, S_IRUGO | S_IWUSR);
MODULE_LICENSE("GPL");
static int debug; /* insmod parameter */
module_param(debug, int, S_IRUGO | S_IWUSR);
MODULE_LICENSE("GPL");
+
/* Addresses to scan */
static unsigned short normal_i2c[] = {
/* Addresses to scan */
static unsigned short normal_i2c[] = {
- I2C_
ADDR_
TDA9875 >> 1,
+ I2C_TDA9875 >> 1,
I2C_CLIENT_END
};
I2C_CLIENT_INSMOD;
/* This is a superset of the TDA9875 */
struct tda9875 {
I2C_CLIENT_END
};
I2C_CLIENT_INSMOD;
/* This is a superset of the TDA9875 */
struct tda9875 {
+ int mode;
int rvol, lvol;
int bass, treble;
struct i2c_client c;
int rvol, lvol;
int bass, treble;
struct i2c_client c;
@@
-195,6
+197,7
@@
static void do_tda9875_init(struct i2c_client *client)
tda9875_write(client, TDA9875_MUT, 0xcc ); /* General mute */
tda9875_write(client, TDA9875_MUT, 0xcc ); /* General mute */
+ t->mode=AUDIO_UNMUTE;
t->lvol=t->rvol =0; /* 0dB */
t->bass=0; /* 0dB */
t->treble=0; /* 0dB */
t->lvol=t->rvol =0; /* 0dB */
t->bass=0; /* 0dB */
t->treble=0; /* 0dB */