diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-18 06:08:14 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 14:26:51 -0500 |
commit | 7c9b5048305ead226fb16def98d86f3ed67c4807 (patch) | |
tree | f6257da1117336e1c68e183c0ed23968d205c7f8 /drivers | |
parent | fa3fcceb30eb8a3cb2ac299c207c6f89b9aed379 (diff) |
V4L/DVB (3547): Tvaudio.h are just i2c addresses. Merged into i2c-addr.h
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/tvaudio.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tvaudio.h | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 4efb01bb44ac..e68d5190cbbb 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <media/audiochip.h> | 33 | #include <media/audiochip.h> |
34 | #include <media/v4l2-common.h> | 34 | #include <media/v4l2-common.h> |
35 | 35 | ||
36 | #include "tvaudio.h" | 36 | #include <media/i2c-addr.h> |
37 | 37 | ||
38 | /* ---------------------------------------------------------------------- */ | 38 | /* ---------------------------------------------------------------------- */ |
39 | /* insmod args */ | 39 | /* insmod args */ |
diff --git a/drivers/media/video/tvaudio.h b/drivers/media/video/tvaudio.h deleted file mode 100644 index af7e116af9a9..000000000000 --- a/drivers/media/video/tvaudio.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | /* | ||
2 | * i2c bus addresses for the chips supported by tvaudio.c | ||
3 | */ | ||
4 | |||
5 | #define I2C_TDA8425 0x82 | ||
6 | #define I2C_TDA9840 0x84 /* also used by TA8874Z */ | ||
7 | #define I2C_TDA985x_L 0xb4 /* also used by 9873 */ | ||
8 | #define I2C_TDA985x_H 0xb6 | ||
9 | #define I2C_TDA9874 0xb0 /* also used by 9875 */ | ||
10 | |||
11 | #define I2C_TEA6300 0x80 /* also used by 6320 */ | ||
12 | #define I2C_TEA6420 0x98 | ||
13 | |||
14 | #define I2C_PIC16C54 0x96 /* PV951 */ | ||