video: Kconfig: Select VIDEOBUF2_DMA_CONTIG for VIDEO_MX2

Message ID 1331295338-21065-1-git-send-email-festevam@gmail.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Fabio Estevam March 9, 2012, 12:15 p.m. UTC
  Fix the following build error:

LD      .tmp_vmlinux1
drivers/built-in.o: In function `mx2_camera_init_videobuf':
clkdev.c:(.text+0xcfaf4): undefined reference to `vb2_dma_contig_memops'
drivers/built-in.o: In function `mx2_camera_probe':
clkdev.c:(.devinit.text+0x5734): undefined reference to `vb2_dma_contig_init_ctx'
clkdev.c:(.devinit.text+0x5778): undefined reference to `vb2_dma_contig_cleanup_ctx'
drivers/built-in.o: In function `mx2_camera_remove':
clkdev.c:(.devexit.text+0x89c): undefined reference to `vb2_dma_contig_cleanup_ctx'

commit c6a41e3271 ([media] media i.MX27 camera: migrate driver to videobuf2)
missed to select VIDEOBUF2_DMA_CONTIG in Kconfig.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/media/video/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
  

Comments

Fabio Estevam March 13, 2012, 3:36 a.m. UTC | #1
Hi Guennadi,

On 3/9/12, Fabio Estevam <festevam@gmail.com> wrote:
> Fix the following build error:
>
> LD      .tmp_vmlinux1
> drivers/built-in.o: In function `mx2_camera_init_videobuf':
> clkdev.c:(.text+0xcfaf4): undefined reference to `vb2_dma_contig_memops'
> drivers/built-in.o: In function `mx2_camera_probe':
> clkdev.c:(.devinit.text+0x5734): undefined reference to
> `vb2_dma_contig_init_ctx'
> clkdev.c:(.devinit.text+0x5778): undefined reference to
> `vb2_dma_contig_cleanup_ctx'
> drivers/built-in.o: In function `mx2_camera_remove':
> clkdev.c:(.devexit.text+0x89c): undefined reference to
> `vb2_dma_contig_cleanup_ctx'
>
> commit c6a41e3271 ([media] media i.MX27 camera: migrate driver to videobuf2)
> missed to select VIDEOBUF2_DMA_CONTIG in Kconfig.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Could we have this one applied?

Otherwise we get build breakage in linux-next.

Thanks,

Fabio Estevam
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Patch

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 6158073..5c728ec 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -1087,7 +1087,7 @@  config VIDEO_MX2_HOSTSUPPORT
 config VIDEO_MX2
 	tristate "i.MX27/i.MX25 Camera Sensor Interface driver"
 	depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || ARCH_MX25)
-	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF2_DMA_CONTIG
 	select VIDEO_MX2_HOSTSUPPORT
 	---help---
 	  This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor