summary refs log tree commit diff
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-18 08:08:14 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-24 16:26:51 -0300
commit7c9b5048305ead226fb16def98d86f3ed67c4807 (patch)
treef6257da1117336e1c68e183c0ed23968d205c7f8 /drivers
parentfa3fcceb30eb8a3cb2ac299c207c6f89b9aed379 (diff)
downloadlinux-7c9b5048305ead226fb16def98d86f3ed67c4807.tar.gz
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.c2
-rw-r--r--drivers/media/video/tvaudio.h14
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 @@
 #include <media/audiochip.h>
 #include <media/v4l2-common.h>
 
-#include "tvaudio.h"
+#include <media/i2c-addr.h>
 
 /* ---------------------------------------------------------------------- */
 /* 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 @@
-/*
- * 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 */