aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/soc_camera
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-26 15:45:39 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-26 17:52:19 -0400
commit12bd88e62cf7c1557c7cd78f42a76d7c716b2283 (patch)
tree3c165d82e2943b98309a5d084666563ce6e648df /drivers/media/platform/soc_camera
parent7155043c2d027c9c848c3d09badb5af2894ed652 (diff)
[media] be sure that HAS_DMA is enabled for vb2-dma-contig
vb2-dma-contig depends on HAS_DMA, but the Kbuild doesn't take it into account at select. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/soc_camera')
-rw-r--r--drivers/media/platform/soc_camera/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
index c0d4c0f822ea..6af6c6dccda8 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -21,6 +21,7 @@ config VIDEO_MX3
21 tristate "i.MX3x Camera Sensor Interface driver" 21 tristate "i.MX3x Camera Sensor Interface driver"
22 depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA 22 depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA
23 depends on MX3_IPU || COMPILE_TEST 23 depends on MX3_IPU || COMPILE_TEST
24 depends on HAS_DMA
24 select VIDEOBUF2_DMA_CONTIG 25 select VIDEOBUF2_DMA_CONTIG
25 ---help--- 26 ---help---
26 This is a v4l2 driver for the i.MX3x Camera Sensor Interface 27 This is a v4l2 driver for the i.MX3x Camera Sensor Interface
@@ -36,6 +37,7 @@ config VIDEO_RCAR_VIN
36 tristate "R-Car Video Input (VIN) support" 37 tristate "R-Car Video Input (VIN) support"
37 depends on VIDEO_DEV && SOC_CAMERA 38 depends on VIDEO_DEV && SOC_CAMERA
38 depends on ARCH_SHMOBILE || COMPILE_TEST 39 depends on ARCH_SHMOBILE || COMPILE_TEST
40 depends on HAS_DMA
39 select VIDEOBUF2_DMA_CONTIG 41 select VIDEOBUF2_DMA_CONTIG
40 select SOC_CAMERA_SCALE_CROP 42 select SOC_CAMERA_SCALE_CROP
41 ---help--- 43 ---help---
@@ -52,6 +54,7 @@ config VIDEO_SH_MOBILE_CEU
52 tristate "SuperH Mobile CEU Interface driver" 54 tristate "SuperH Mobile CEU Interface driver"
53 depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK 55 depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
54 depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST 56 depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST
57 depends on HAS_DMA
55 select VIDEOBUF2_DMA_CONTIG 58 select VIDEOBUF2_DMA_CONTIG
56 select SOC_CAMERA_SCALE_CROP 59 select SOC_CAMERA_SCALE_CROP
57 ---help--- 60 ---help---
@@ -61,6 +64,7 @@ config VIDEO_OMAP1
61 tristate "OMAP1 Camera Interface driver" 64 tristate "OMAP1 Camera Interface driver"
62 depends on VIDEO_DEV && SOC_CAMERA 65 depends on VIDEO_DEV && SOC_CAMERA
63 depends on ARCH_OMAP1 || COMPILE_TEST 66 depends on ARCH_OMAP1 || COMPILE_TEST
67 depends on HAS_DMA
64 select VIDEOBUF_DMA_CONTIG 68 select VIDEOBUF_DMA_CONTIG
65 select VIDEOBUF_DMA_SG 69 select VIDEOBUF_DMA_SG
66 ---help--- 70 ---help---
@@ -70,6 +74,7 @@ config VIDEO_MX2
70 tristate "i.MX27 Camera Sensor Interface driver" 74 tristate "i.MX27 Camera Sensor Interface driver"
71 depends on VIDEO_DEV && SOC_CAMERA 75 depends on VIDEO_DEV && SOC_CAMERA
72 depends on SOC_IMX27 || COMPILE_TEST 76 depends on SOC_IMX27 || COMPILE_TEST
77 depends on HAS_DMA
73 select VIDEOBUF2_DMA_CONTIG 78 select VIDEOBUF2_DMA_CONTIG
74 ---help--- 79 ---help---
75 This is a v4l2 driver for the i.MX27 Camera Sensor Interface 80 This is a v4l2 driver for the i.MX27 Camera Sensor Interface
@@ -78,6 +83,7 @@ config VIDEO_ATMEL_ISI
78 tristate "ATMEL Image Sensor Interface (ISI) support" 83 tristate "ATMEL Image Sensor Interface (ISI) support"
79 depends on VIDEO_DEV && SOC_CAMERA 84 depends on VIDEO_DEV && SOC_CAMERA
80 depends on ARCH_AT91 || COMPILE_TEST 85 depends on ARCH_AT91 || COMPILE_TEST
86 depends on HAS_DMA
81 select VIDEOBUF2_DMA_CONTIG 87 select VIDEOBUF2_DMA_CONTIG
82 ---help--- 88 ---help---
83 This module makes the ATMEL Image Sensor Interface available 89 This module makes the ATMEL Image Sensor Interface available