diff options
| author | Dong Aisheng <b29396@freescale.com> | 2015-06-15 19:35:15 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:23:50 -0500 |
| commit | c875a3d928a1a20696b4cb3c2d522f2f6ac413ba (patch) | |
| tree | 649f29f40492162cb31b216880bc9c5ee4bf8da8 /arch/arm/configs | |
| parent | 185f3edc1785f24a9e39d0d5966f93b63ead53ca (diff) | |
Revert "MLK-11080-3 dts: imx_v7_defconfig: enable CONFIG_BCM4339 to optimize performance"
WL_HOST_WAKEUP feature causes system suspend/resume break, so revert.
This reverts commit d9edd6e61897e4253fcbf0c7d2680933583e13c8.
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 86e83052fd4c..25b765d66042 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -157,7 +157,6 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_BCMDHD=m CONFIG_BCMDHD_SDIO=y -CONFIG_BCM4339=m CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin" CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal" # CONFIG_INPUT_MOUSEDEV_PSAUX is not set @@ -181,7 +180,6 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_MMA8450=y CONFIG_INPUT_ISL29023=y CONFIG_INPUT_MPL3115=y -CONFIG_SENSOR_FXLS8471=y CONFIG_SERIO_SERPORT=m # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set @@ -447,3 +445,4 @@ CONFIG_LIBCRC32C=m CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +CONFIG_SENSOR_FXLS8471=y |