summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDong Aisheng <b29396@freescale.com>2015-06-15 19:35:15 +0800
committerDong Aisheng <b29396@freescale.com>2015-06-15 22:29:14 +0800
commitfc6828207f0f9d0cecc5cbc9b3fdf2c86dcaf2eb (patch)
treee761487e7f57bddb225768c3d6e39f829b54b474 /arch
parente874116224f202258708c0346599111131a583e6 (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')
-rw-r--r--arch/arm/configs/imx_v7_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index b8a62e3f347f..034aae9bc7bd 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
@@ -446,3 +444,4 @@ CONFIG_LIBCRC32C=m
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
+CONFIG_SENSOR_FXLS8471=y