From: Arnd Bergmann Date: Wed, 28 Jan 2015 22:11:20 +0000 (-0300) Subject: [media] marvell-ccic: MMP_CAMERA no longer builds X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=caaee5f83291086f5e5003635b77536b18aae5f7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [media] marvell-ccic: MMP_CAMERA no longer builds The mmp ccic driver expects a platform_data structure that does not exist in the mainline kernel and presumably was changed in a kernel fork, which leads to build errors now: media/platform/marvell-ccic/mmp-driver.c: In function 'mmpcam_calc_dphy': media/platform/marvell-ccic/mmp-driver.c:252:15: error: 'struct mmp_camera_platform_data' has no member named 'dphy3_algo' switch (pdata->dphy3_algo) { ^ media/platform/marvell-ccic/mmp-driver.c:253:7: error: 'DPHY3_ALGO_PXA910' undeclared (first use in this function) case DPHY3_ALGO_PXA910: ^ media/platform/marvell-ccic/mmp-driver.c:253:7: note: each undeclared identifier is reported only once for each function it appears in media/platform/marvell-ccic/mmp-driver.c:257:8: error: 'struct mmp_camera_platform_data' has no member named 'dphy' This marks the driver as 'BROKEN' but keeps the code around. Alternatively it could be removed entirely. Fixes: 05fed81625bf75 ("[media] marvell-ccic: add MIPI support for marvell-ccic driver") Signed-off-by: Arnd Bergmann Acked-by: Jonathan Corbet Cc: Libin Yang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig index 3d166568bd69..4bf5bd1e90d6 100644 --- a/drivers/media/platform/marvell-ccic/Kconfig +++ b/drivers/media/platform/marvell-ccic/Kconfig @@ -14,7 +14,7 @@ config VIDEO_CAFE_CCIC config VIDEO_MMP_CAMERA tristate "Marvell Armada 610 integrated camera controller support" depends on ARCH_MMP && I2C && VIDEO_V4L2 - depends on HAS_DMA + depends on HAS_DMA && BROKEN select VIDEO_OV7670 select I2C_GPIO select VIDEOBUF2_DMA_SG