Merge ../linus

[linux-2.6-omap-h63xx.git] / include / media / ovcamchip.h

diff --git a/include/media/ovcamchip.h b/include/media/ovcamchip.h
index cb7c0aa96f22783f543bd39e75792d0b78a021a6..0f43451f8bb3599db431e12789cd498b71ecc168 100644 (file)
--- a/include/media/ovcamchip.h
+++ b/include/media/ovcamchip.h
@@ -15,22 +15,9 @@
 #define __LINUX_OVCAMCHIP_H
 
 #include <linux/videodev.h>
+#include <media/v4l2-common.h>
 #include <linux/i2c.h>
 
-/* Remove these once they are officially defined */
-#ifndef I2C_DRIVERID_OVCAMCHIP
-       #define I2C_DRIVERID_OVCAMCHIP  0xf00f
-#endif
-#ifndef I2C_HW_SMBUS_OV511
-       #define I2C_HW_SMBUS_OV511      0xfe
-#endif
-#ifndef I2C_HW_SMBUS_OV518
-       #define I2C_HW_SMBUS_OV518      0xff
-#endif
-#ifndef I2C_HW_SMBUS_OVFX2
-       #define I2C_HW_SMBUS_OVFX2      0xfd
-#endif
-
 /* --------------------------------- */
 /*           ENUMERATIONS            */
 /* --------------------------------- */