diff options
-rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 78ed575feb1a..d10040108249 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
@@ -121,6 +121,7 @@ CONFIG_REGULATOR_MC13892=y | |||
121 | CONFIG_MEDIA_SUPPORT=y | 121 | CONFIG_MEDIA_SUPPORT=y |
122 | CONFIG_VIDEO_DEV=y | 122 | CONFIG_VIDEO_DEV=y |
123 | CONFIG_V4L_PLATFORM_DRIVERS=y | 123 | CONFIG_V4L_PLATFORM_DRIVERS=y |
124 | CONFIG_MEDIA_CAMERA_SUPPORT=y | ||
124 | CONFIG_SOC_CAMERA=y | 125 | CONFIG_SOC_CAMERA=y |
125 | CONFIG_SOC_CAMERA_OV2640=y | 126 | CONFIG_SOC_CAMERA_OV2640=y |
126 | CONFIG_VIDEO_MX2=y | 127 | CONFIG_VIDEO_MX2=y |
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 394ded624e37..508ac9d8e056 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -143,15 +143,18 @@ CONFIG_GPIO_MC9S08DZ60=y | |||
143 | # CONFIG_HWMON is not set | 143 | # CONFIG_HWMON is not set |
144 | CONFIG_WATCHDOG=y | 144 | CONFIG_WATCHDOG=y |
145 | CONFIG_IMX2_WDT=y | 145 | CONFIG_IMX2_WDT=y |
146 | CONFIG_MFD_DA9052_I2C=y | ||
146 | CONFIG_MFD_MC13XXX_SPI=y | 147 | CONFIG_MFD_MC13XXX_SPI=y |
147 | CONFIG_MFD_MC13XXX_I2C=y | 148 | CONFIG_MFD_MC13XXX_I2C=y |
148 | CONFIG_REGULATOR=y | 149 | CONFIG_REGULATOR=y |
149 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 150 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
151 | CONFIG_REGULATOR_DA9052=y | ||
150 | CONFIG_REGULATOR_MC13783=y | 152 | CONFIG_REGULATOR_MC13783=y |
151 | CONFIG_REGULATOR_MC13892=y | 153 | CONFIG_REGULATOR_MC13892=y |
152 | CONFIG_MEDIA_SUPPORT=y | 154 | CONFIG_MEDIA_SUPPORT=y |
153 | CONFIG_VIDEO_DEV=y | 155 | CONFIG_VIDEO_DEV=y |
154 | CONFIG_V4L_PLATFORM_DRIVERS=y | 156 | CONFIG_V4L_PLATFORM_DRIVERS=y |
157 | CONFIG_MEDIA_CAMERA_SUPPORT=y | ||
155 | CONFIG_SOC_CAMERA=y | 158 | CONFIG_SOC_CAMERA=y |
156 | CONFIG_SOC_CAMERA_OV2640=y | 159 | CONFIG_SOC_CAMERA_OV2640=y |
157 | CONFIG_VIDEO_MX3=y | 160 | CONFIG_VIDEO_MX3=y |