diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 14:55:11 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 14:55:11 +0900 |
commit | 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch) | |
tree | f23b591e8c6f921c91fce00a6453d4087ec3c071 /arch/arm/mach-omap1/include/mach/camera.h | |
parent | 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff) | |
parent | 193006f7e3b1abd42d7a3677b54fa2996461a842 (diff) | |
download | blackbird-op-linux-7d0dbea312a6508389241b4fb6cda1c4d1e32d6e.tar.gz blackbird-op-linux-7d0dbea312a6508389241b4fb6cda1c4d1e32d6e.zip |
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/camera.h')
-rw-r--r-- | arch/arm/mach-omap1/include/mach/camera.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/include/mach/camera.h b/arch/arm/mach-omap1/include/mach/camera.h index fd54b452eb22..847d00f0bb0a 100644 --- a/arch/arm/mach-omap1/include/mach/camera.h +++ b/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) |