diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-18 08:08:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-18 08:08:14 -0300 |
| commit | 1bbb3db56cffd24a689fe904034f3a9ac65ff2d4 (patch) | |
| tree | 5a7be85e5c1a6fbc606f79878901b52f71603fbc /linux | |
| parent | f1883ef19f33045c8c559b1a94912773946f0cfa (diff) | |
| download | mediapointer-dvb-s2-1bbb3db56cffd24a689fe904034f3a9ac65ff2d4.tar.gz mediapointer-dvb-s2-1bbb3db56cffd24a689fe904034f3a9ac65ff2d4.tar.bz2 | |
tvaudio.h are just i2c addresses. Merged into i2c-addr.h
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/tvaudio.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvaudio.h | 14 | ||||
| -rw-r--r-- | linux/include/media/i2c-addr.h | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c index e6a8f65b8..d371f7d4c 100644 --- a/linux/drivers/media/video/tvaudio.c +++ b/linux/drivers/media/video/tvaudio.c @@ -38,7 +38,7 @@ #include <media/audiochip.h> #include <media/v4l2-common.h> -#include "tvaudio.h" +#include <media/i2c-addr.h> /* ---------------------------------------------------------------------- */ /* insmod args */ diff --git a/linux/drivers/media/video/tvaudio.h b/linux/drivers/media/video/tvaudio.h deleted file mode 100644 index af7e116af..000000000 --- a/linux/drivers/media/video/tvaudio.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * i2c bus addresses for the chips supported by tvaudio.c - */ - -#define I2C_TDA8425 0x82 -#define I2C_TDA9840 0x84 /* also used by TA8874Z */ -#define I2C_TDA985x_L 0xb4 /* also used by 9873 */ -#define I2C_TDA985x_H 0xb6 -#define I2C_TDA9874 0xb0 /* also used by 9875 */ - -#define I2C_TEA6300 0x80 /* also used by 6320 */ -#define I2C_TEA6420 0x98 - -#define I2C_PIC16C54 0x96 /* PV951 */ diff --git a/linux/include/media/i2c-addr.h b/linux/include/media/i2c-addr.h index 4212832d4..7b0f5fe94 100644 --- a/linux/include/media/i2c-addr.h +++ b/linux/include/media/i2c-addr.h @@ -28,3 +28,17 @@ #define I2C_DPL3518 0x84 #define I2C_TDA9887 0x86 +/* + * i2c bus addresses for the chips supported by tvaudio.c + */ + +#define I2C_TDA8425 0x82 +#define I2C_TDA9840 0x84 /* also used by TA8874Z */ +#define I2C_TDA985x_L 0xb4 /* also used by 9873 */ +#define I2C_TDA985x_H 0xb6 +#define I2C_TDA9874 0xb0 /* also used by 9875 */ + +#define I2C_TEA6300 0x80 /* also used by 6320 */ +#define I2C_TEA6420 0x98 + +#define I2C_PIC16C54 0x96 /* PV951 */ |