From: zyc Date: Fri, 12 Dec 2014 03:40:23 +0000 (+0800) Subject: cif: set CONFIG_RK30_CAMERA_ONEFRAME default as yes in rockchip_defconfig X-Git-Tag: firefly_0821_release~4384 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3e986e49cf0585a492af565a5765002a70c0f53f;p=firefly-linux-kernel-4.4.55.git cif: set CONFIG_RK30_CAMERA_ONEFRAME default as yes in rockchip_defconfig --- diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index ffc7733f2f57..eabe53d9da84 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -391,7 +391,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_CAMSYS_DRV=y CONFIG_FLASHLIGHT=y CONFIG_LEDS_RT8547=y -# CONFIG_RK30_CAMERA_ONEFRAME is not set +CONFIG_RK30_CAMERA_ONEFRAME=y CONFIG_MALI_MIDGARD=m CONFIG_MALI_MIDGARD_DVFS=y CONFIG_MALI_MIDGARD_RT_PM=y diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 6a92b1a916ed..a26568d9804c 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -1,7 +1,5 @@ config ROCK_CHIP_SOC_CAMERA tristate "rockchip supported soc cameras " - select SOC_CAMERA - select VIDEOBUF_DMA_CONTIG default y menu "rockchip camera sensor interface driver" @@ -14,10 +12,14 @@ menu "rockchip camera sensor interface driver" config RK30_CAMERA_ONEFRAME tristate "rk30_camera_oneframe" depends on ROCKCHIP_CAMERA_SENSOR_INTERFACE - default y + select SOC_CAMERA + select VIDEOBUF_DMA_CONTIG + default n config RK30_CAMERA_PINGPONG tristate "rk30_camera_pingpong" depends on ROCKCHIP_CAMERA_SENSOR_INTERFACE - + select SOC_CAMERA + select VIDEOBUF_DMA_CONTIG + default n endmenu