diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:06:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:06:11 -0800 |
| commit | 6800e4c0ea3e96cf78953b8b5743381cb1bb9e37 (patch) | |
| tree | 5f55b84771d1b73bcaec534fdbbc1ec6dd21598d /arch/arm/mach-omap1/include/mach/camera.h | |
| parent | 477d4e4fbedafb1cc636124f2de06defceb399b0 (diff) | |
| parent | dfcccd3aaba15e4e8ffae65fb2a757b3e49470de (diff) | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
arm: omap1: devices: need to return with a value
OMAP1: camera.h: add missing include
omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
OMAP2: Devkit8000: Fix mmc regulator failure
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 fd54b452eb2..847d00f0bb0 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) |