diff options
| author | Arnd Bergmann | 2012-11-15 17:06:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-11-15 17:06:24 +0100 |
| commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
| tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /drivers/media/platform/soc_camera | |
| parent | ARM: pxa: remove pxa95x support (diff) | |
| parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
| download | kernel-qcow2-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.gz kernel-qcow2-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.xz kernel-qcow2-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'drivers/media/platform/soc_camera')
| -rw-r--r-- | drivers/media/platform/soc_camera/omap1_camera.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c index fa08c7695ccb..cae9ce6275e9 100644 --- a/drivers/media/platform/soc_camera/omap1_camera.c +++ b/drivers/media/platform/soc_camera/omap1_camera.c @@ -34,12 +34,13 @@ #include <media/videobuf-dma-contig.h> #include <media/videobuf-dma-sg.h> -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #define DRIVER_NAME "omap1-camera" #define DRIVER_VERSION "0.0.2" +#define OMAP_DMA_CAMERA_IF_RX 20 /* * --------------------------------------------------------------------------- |