diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-12-12 15:21:22 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-02-12 10:46:54 -0700 |
| commit | 257046e707fc88faca91bc5e91a129ee5476c587 (patch) | |
| tree | c14cd48b0105683537cffc4c535d8d26968627a3 | |
| parent | 734ce5be056add6324b1d08fdef99cf860e66b8a (diff) | |
nitrogen6x_defconfig: remove unsupported cameras
| -rw-r--r-- | arch/arm/configs/nitrogen6x_defconfig | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/configs/nitrogen6x_defconfig b/arch/arm/configs/nitrogen6x_defconfig index 35e4cc39511d..a508b6060a70 100644 --- a/arch/arm/configs/nitrogen6x_defconfig +++ b/arch/arm/configs/nitrogen6x_defconfig @@ -287,7 +287,6 @@ CONFIG_IMX_HAVE_PLATFORM_FSL_OTG=y CONFIG_IMX_HAVE_PLATFORM_FSL_USB_WAKEUP=y CONFIG_IMX_HAVE_PLATFORM_IMX_PM=y CONFIG_IMX_HAVE_PLATFORM_IMX_ASRC=y -CONFIG_IMX_HAVE_PLATFORM_IMX_MIPI_DSI=y CONFIG_IMX_HAVE_PLATFORM_IMX_MIPI_CSI2=y CONFIG_IMX_HAVE_PLATFORM_IMX_VDOA=y CONFIG_IMX_HAVE_PLATFORM_IMX_PCIE=y @@ -1850,12 +1849,11 @@ CONFIG_VIDEO_MXC_IPU_CAMERA=y # CONFIG_VIDEO_MXC_CSI_CAMERA is not set # CONFIG_MXC_CAMERA_MICRON111 is not set # CONFIG_MXC_CAMERA_OV2640 is not set -CONFIG_MXC_CAMERA_OV3640=m -CONFIG_MXC_CAMERA_OV5640=m -CONFIG_MXC_CAMERA_OV8820_MIPI=m +# CONFIG_MXC_CAMERA_OV3640 is not set +# CONFIG_MXC_CAMERA_OV5640 is not set +# CONFIG_MXC_CAMERA_OV8820_MIPI is not set CONFIG_MXC_CAMERA_OV5642=m -CONFIG_MXC_TVIN_ADV7180=m -CONFIG_MXC_CAMERA_OV5640_MIPI=m +# CONFIG_MXC_CAMERA_OV5640_MIPI is not set CONFIG_MXC_CAMERA_SENSOR_CLK=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_MXC_IPU_PRP_ENC=m |