Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[mv-sheeva.git] / drivers / media / video / tda9840.h

diff --git a/drivers/media/video/tda9840.h b/drivers/media/video/tda9840.h
index 28021053bd097f64d389503d108967ad337e43f0..7da8432cdca7378ea1c4879c0e7db27213753d75 100644 (file)
--- a/drivers/media/video/tda9840.h
+++ b/drivers/media/video/tda9840.h
@@ -1,7 +1,7 @@
 #ifndef __INCLUDED_TDA9840__
 #define __INCLUDED_TDA9840__
 
-#define        I2C_TDA9840             0x42
+#define        I2C_ADDR_TDA9840                0x42
 
 #define TDA9840_DETECT         _IOR('v',1,int)
 /* return values for TDA9840_DETCT */