Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / drivers / media / video / tea6420.h

diff --git a/drivers/media/video/tea6420.h b/drivers/media/video/tea6420.h
index ea664df15ad4f8bdd8446f3bd7e5f6b7bf0b79d5..5ef7c18e0c5404e08d0a4a840f050b15db33c6e6 100644 (file)
--- a/drivers/media/video/tea6420.h
+++ b/drivers/media/video/tea6420.h
@@ -2,8 +2,8 @@
 #define __INCLUDED_TEA6420__
 
 /* possible addresses */
-#define        I2C_TEA6420_1           0x4c
-#define        I2C_TEA6420_2           0x4d
+#define        I2C_ADDR_TEA6420_1              0x4c
+#define        I2C_ADDR_TEA6420_2              0x4d
 
 struct tea6420_multiplex
 {