diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
| commit | 53640f41b97792b0889bb70f26f99c06743162a1 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /drivers/media/platform/soc_camera/mx3_camera.c | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
Diffstat (limited to 'drivers/media/platform/soc_camera/mx3_camera.c')
| -rw-r--r-- | drivers/media/platform/soc_camera/mx3_camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c index 3557ac97e430..64d39b1b5582 100644 --- a/drivers/media/platform/soc_camera/mx3_camera.c +++ b/drivers/media/platform/soc_camera/mx3_camera.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/vmalloc.h> | 17 | #include <linux/vmalloc.h> |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 20 | #include <linux/dma/ipu-dma.h> | ||
| 20 | 21 | ||
| 21 | #include <media/v4l2-common.h> | 22 | #include <media/v4l2-common.h> |
| 22 | #include <media/v4l2-dev.h> | 23 | #include <media/v4l2-dev.h> |
| @@ -24,7 +25,6 @@ | |||
| 24 | #include <media/soc_camera.h> | 25 | #include <media/soc_camera.h> |
| 25 | #include <media/soc_mediabus.h> | 26 | #include <media/soc_mediabus.h> |
| 26 | 27 | ||
| 27 | #include <mach/ipu.h> | ||
| 28 | #include <linux/platform_data/camera-mx3.h> | 28 | #include <linux/platform_data/camera-mx3.h> |
| 29 | #include <linux/platform_data/dma-imx.h> | 29 | #include <linux/platform_data/dma-imx.h> |
| 30 | 30 | ||