aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaoran Wang <Haoran.Wang@freescale.com>2016-05-17 14:08:30 +0800
committerHaoran Wang <Haoran.Wang@freescale.com>2016-05-17 17:41:02 +0800
commit29eef2d85b34ef349fed2412d0c0c7fa3e9bb3a0 (patch)
tree141f8c110934fd0721fcf618d23533ada20cc617
parent5d574fcd7eea8e577299f1746e8e9be06cd6a4cf (diff)
downloadpicoimx-3.14-29eef2d85b34ef349fed2412d0c0c7fa3e9bb3a0.tar.gz
picoimx: Removed unused config
Removed unused def configs for Brillo. We use BCM4339 WiFi card for Brillo only. The BRCMFMAC will be conflict with the BCM4339 if use the Brillo's kernel.mk. Bug:28768869 Change-Id: I63632373d4a239cdc9e0dfbaff90deda49c6f4e0 Signed-off-by: Haoran Wang <Haoran.Wang@freescale.com>
-rw-r--r--arch/arm/configs/imx_v7_android_defconfig5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/configs/imx_v7_android_defconfig b/arch/arm/configs/imx_v7_android_defconfig
index 449e3b6cc2c..458c6e78497 100644
--- a/arch/arm/configs/imx_v7_android_defconfig
+++ b/arch/arm/configs/imx_v7_android_defconfig
@@ -273,15 +273,10 @@ CONFIG_USB_RTL8150=y
CONFIG_USB_RTL8152=y
CONFIG_USB_USBNET=y
CONFIG_USB_NET_CDC_EEM=y
-CONFIG_ATH_CARDS=m
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
CONFIG_BCMDHD=y
CONFIG_BCMDHD_SDIO=y
CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/bcm/fw_bcmdhd.bin"
CONFIG_BCMDHD_NVRAM_PATH="/system/etc/firmware/bcm/bcmdhd.cal"
-CONFIG_BRCMFMAC=m
-CONFIG_RTL8821AS=m
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_KEYRESET=y