summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorDong Aisheng <aisheng.dong@freescale.com>2015-10-29 17:07:32 +0800
committerDong Aisheng <aisheng.dong@freescale.com>2015-10-29 17:07:32 +0800
commit923f740d74cb32d0d248e07dd0d5aa65a6eeda4f (patch)
tree3c3410681bcb50ca2333eb801be6a714b3acfb8c /arch/arm/configs
parent836b6c1eface9bfa490620cc4989a2adeb4e16e0 (diff)
MLK-11790 imx_v7_defconfig: remove atheros wifi support
make savedefconfig shows CONFIG_KEYBOARD_SNVS_PWRKEY and CONFIG_MXC_MLB150 also needs to be removed. So remove them together. Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx_v7_defconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index abdf1dffcf25..e3315f315c15 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -152,18 +152,15 @@ CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_CDC_EEM=m
-CONFIG_ATH_CARDS=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
CONFIG_BCMDHD=m
CONFIG_BCMDHD_SDIO=y
CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin"
CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal"
+# CONFIG_RTL_CARDS is not set
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_SNVS_PWRKEY=y
CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
@@ -341,7 +338,6 @@ CONFIG_MXC_IPU=y
CONFIG_MXC_GPU_VIV=y
CONFIG_MXC_IPU_V3_PRE=y
CONFIG_MXC_MIPI_CSI2=y
-CONFIG_MXC_MLB150=m
CONFIG_MXC_SIM=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y