From 7c9b5048305ead226fb16def98d86f3ed67c4807 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 18 Mar 2006 08:08:14 -0300
Subject: [PATCH] V4L/DVB (3547): Tvaudio.h are just i2c addresses. Merged into
 i2c-addr.h

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 drivers/media/video/tvaudio.c |  2 +-
 drivers/media/video/tvaudio.h | 14 --------------
 include/media/i2c-addr.h      | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 drivers/media/video/tvaudio.h

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 */
diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h
index 4212832d48aa..7b0f5fe94e08 100644
--- a/include/media/i2c-addr.h
+++ b/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 */