V4L/DVB (10542): v4l2-subdev: add querystd and g_input_status

[safe/jmp/linux-2.6] / include / media / i2c-addr.h

diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h
index 7b0f5fe..5d0f560 100644 (file)
--- a/include/media/i2c-addr.h
+++ b/include/media/i2c-addr.h
@@ -1,44 +1,42 @@
 /*
- *  V4L I2C address list
+ *     V4L I2C address list
  *
  *
- *  Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ *     Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
  *     Based on a previous mapping by
- *             Ralph Metzler (rjkm@thp.uni-koeln.de)
- *             Gerd Knorr <kraxel@goldbach.in-berlin.de>
+ *     Ralph Metzler (rjkm@thp.uni-koeln.de)
+ *     Gerd Knorr <kraxel@goldbach.in-berlin.de>
  *
  */
 
 /* bttv address list */
-#define I2C_TSA5522        0xc2
-#define I2C_TDA7432        0x8a
-#define I2C_BT832_ALT1    0x88
-#define I2C_BT832_ALT2    0x8a // alternate setting
-#define I2C_TDA8425        0x82
-#define I2C_TDA9840        0x84
-#define I2C_TDA9850        0xb6 /* also used by 9855,9873 */
-#define I2C_TDA9874        0xb0 /* also used by 9875 */
-#define I2C_TDA9875        0xb0
-#define I2C_HAUPEE         0xa0
-#define I2C_STBEE          0xae
-#define I2C_VHX            0xc0
-#define I2C_MSP3400        0x80
-#define I2C_MSP3400_ALT    0x88
-#define I2C_TEA6300        0x80 /* also used by 6320 */
-#define I2C_DPL3518       0x84
-#define I2C_TDA9887       0x86
+#define I2C_ADDR_TSA5522       0xc2
+#define I2C_ADDR_TDA7432       0x8a
+#define I2C_ADDR_TDA8425       0x82
+#define I2C_ADDR_TDA9840       0x84
+#define I2C_ADDR_TDA9850       0xb6 /* also used by 9855,9873 */
+#define I2C_ADDR_TDA9874       0xb0 /* also used by 9875 */
+#define I2C_ADDR_TDA9875       0xb0
+#define I2C_ADDR_HAUPEE                0xa0
+#define I2C_ADDR_STBEE         0xae
+#define I2C_ADDR_VHX           0xc0
+#define I2C_ADDR_MSP3400       0x80
+#define I2C_ADDR_MSP3400_ALT   0x88
+#define I2C_ADDR_TEA6300       0x80 /* also used by 6320 */
+#define I2C_ADDR_DPL3518       0x84
+#define I2C_ADDR_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_ADDR_TDA8425       0x82
+#define I2C_ADDR_TDA9840       0x84 /* also used by TA8874Z */
+#define I2C_ADDR_TDA985x_L     0xb4 /* also used by 9873 */
+#define I2C_ADDR_TDA985x_H     0xb6
+#define I2C_ADDR_TDA9874       0xb0 /* also used by 9875 */
 
-#define I2C_TEA6300        0x80 /* also used by 6320 */
-#define I2C_TEA6420       0x98
+#define I2C_ADDR_TEA6300       0x80 /* also used by 6320 */
+#define I2C_ADDR_TEA6420       0x98
 
-#define I2C_PIC16C54       0x96 /* PV951 */
+#define I2C_ADDR_PIC16C54      0x96 /* PV951 */