diff options
| author | Fabio Estevam | 2018-03-03 21:05:47 +0100 |
|---|---|---|
| committer | Shawn Guo | 2018-03-26 13:23:35 +0200 |
| commit | f0dc7437265d67f582c0a0cdb1c528665a8bfa32 (patch) | |
| tree | 0f8ec7f56fdf2b78053dd3fcfc165a89f317b61a /arch/arm/configs/imx_v4_v5_defconfig | |
| parent | ARM: imx_v6_v7_defconfig: Select CONFIG_SND_SOC_WM8962 explicitly (diff) | |
| download | kernel-qcow2-linux-f0dc7437265d67f582c0a0cdb1c528665a8bfa32.tar.gz kernel-qcow2-linux-f0dc7437265d67f582c0a0cdb1c528665a8bfa32.tar.xz kernel-qcow2-linux-f0dc7437265d67f582c0a0cdb1c528665a8bfa32.zip | |
ARM: imx_v4_v5_defconfig: Re-sync defconfig
Re-sync the defconfig by doing:
make savedefconfig
cp defconfig arch/arm/configs/imx_v4_v5_defconfig
So keep it in sync to help further changes in defconfig.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
| -rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index ca0f13cafe38..893d0a0cefc1 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -1,7 +1,6 @@ # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y -CONFIG_FHANDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_LOG_BUF_SHIFT=14 @@ -78,7 +77,6 @@ CONFIG_SMC91X=y CONFIG_SMC911X=y CONFIG_SMSC911X=y CONFIG_SMSC_PHY=y -# CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_IMX=y @@ -105,8 +103,8 @@ CONFIG_HWMON=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y -CONFIG_MFD_MX25_TSADC=y CONFIG_MFD_MC13XXX_SPI=y +CONFIG_MFD_MX25_TSADC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y @@ -116,10 +114,8 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_SOC_CAMERA=y -CONFIG_VIDEO_MX2=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CODA=y -CONFIG_SOC_CAMERA_OV2640=y CONFIG_FB=y CONFIG_FB_IMX=y CONFIG_LCD_L4F00242T03=y |