Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming

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

diff --git a/include/media/ovcamchip.h b/include/media/ovcamchip.h
index 8138983..05b9569 100644 (file)
--- a/include/media/ovcamchip.h
+++ b/include/media/ovcamchip.h
@@ -15,7 +15,7 @@
 #define __LINUX_OVCAMCHIP_H
 
 #include <linux/videodev.h>
-#include <linux/i2c.h>
+#include <media/v4l2-common.h>
 
 /* --------------------------------- */
 /*           ENUMERATIONS            */