From da60e8773fc636a27da0553123887a4d8ecd5bc0 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] --- yaml --- r: 23628 b: refs/heads/master c:
 7c9b5048305ead226fb16def98d86f3ed67c4807 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/tvaudio.c |  2 +-
 trunk/drivers/media/video/tvaudio.h | 14 --------------
 trunk/include/media/i2c-addr.h      | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 trunk/drivers/media/video/tvaudio.h

diff --git a/[refs] b/[refs]
index ee119d53e346..b64ed17622a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa3fcceb30eb8a3cb2ac299c207c6f89b9aed379
+refs/heads/master: 7c9b5048305ead226fb16def98d86f3ed67c4807
diff --git a/trunk/drivers/media/video/tvaudio.c b/trunk/drivers/media/video/tvaudio.c
index 4efb01bb44ac..e68d5190cbbb 100644
--- a/trunk/drivers/media/video/tvaudio.c
+++ b/trunk/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/trunk/drivers/media/video/tvaudio.h b/trunk/drivers/media/video/tvaudio.h
deleted file mode 100644
index af7e116af9a9..000000000000
--- a/trunk/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/trunk/include/media/i2c-addr.h b/trunk/include/media/i2c-addr.h
index 4212832d48aa..7b0f5fe94e08 100644
--- a/trunk/include/media/i2c-addr.h
+++ b/trunk/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 */