diff options
Diffstat (limited to 'arch/arm/configs/apalis_imx6_defconfig')
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 5396a8a5ade8..0a172acf67bc 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -149,7 +149,6 @@ CONFIG_TOUCHSCREEN_STMPE=y CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y -CONFIG_MFD_STMPE=y CONFIG_SERIO_SERPORT=m CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y @@ -202,7 +201,6 @@ CONFIG_MXC_TVIN_ADV7180=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_SOC_CAMERA=y -CONFIG_VIDEO_MX3=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_DVB_AU8522_V4L is not set # CONFIG_DVB_TUNER_DIB0070 is not set @@ -276,7 +274,6 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y -CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_RTC_CLASS=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_DRV_DS1307=y @@ -286,10 +283,10 @@ CONFIG_DMADEVICES=y CONFIG_MXC_PXP_V2=y CONFIG_IMX_SDMA=y CONFIG_STAGING=y +CONFIG_STMPE_ADC=y CONFIG_COMMON_CLK_DEBUG=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y -CONFIG_STMPE_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT2_FS=y |