diff --git a/[refs] b/[refs]
index 3a7ca762f80c..f4ac958faf96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e860e6da96f5a320a752da232e03d7bf885710b7
+refs/heads/master: 1cff502d8b22272addc4f5f57346d598b4755d9e
diff --git a/trunk/arch/arm/mach-omap1/include/mach/camera.h b/trunk/arch/arm/mach-omap1/include/mach/camera.h
index fd54b452eb22..847d00f0bb0a 100644
--- a/trunk/arch/arm/mach-omap1/include/mach/camera.h
+++ b/trunk/arch/arm/mach-omap1/include/mach/camera.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_ARCH_CAMERA_H_
 #define __ASM_ARCH_CAMERA_H_
 
+#include <media/omap1_camera.h>
+
 void omap1_camera_init(void *);
 
 static inline void omap1_set_camera_info(struct omap1_cam_platform_data *info)