Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[pandora-kernel.git] / include / media / i2c-addr.h

diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h
index e7ff44a..5d0f560 100644 (file)
--- a/include/media/i2c-addr.h
+++ b/include/media/i2c-addr.h
@@ -12,8 +12,6 @@
 /* bttv address list */
 #define I2C_ADDR_TSA5522       0xc2
 #define I2C_ADDR_TDA7432       0x8a
-#define I2C_ADDR_BT832_ALT1    0x88
-#define I2C_ADDR_BT832_ALT2    0x8a // alternate setting
 #define I2C_ADDR_TDA8425       0x82
 #define I2C_ADDR_TDA9840       0x84
 #define I2C_ADDR_TDA9850       0xb6 /* also used by 9855,9873 */