diff options
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index d3e044a8a10a..577f054dbd8e 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -61,7 +61,10 @@ CONFIG_IP_PNP_DHCP=y | |||
61 | # CONFIG_INET_LRO is not set | 61 | # CONFIG_INET_LRO is not set |
62 | CONFIG_IPV6=y | 62 | CONFIG_IPV6=y |
63 | CONFIG_NETFILTER=y | 63 | CONFIG_NETFILTER=y |
64 | # CONFIG_WIRELESS is not set | 64 | CONFIG_CFG80211=y |
65 | CONFIG_MAC80211=y | ||
66 | CONFIG_RFKILL=y | ||
67 | CONFIG_RFKILL_INPUT=y | ||
65 | CONFIG_DEVTMPFS=y | 68 | CONFIG_DEVTMPFS=y |
66 | CONFIG_DEVTMPFS_MOUNT=y | 69 | CONFIG_DEVTMPFS_MOUNT=y |
67 | # CONFIG_STANDALONE is not set | 70 | # CONFIG_STANDALONE is not set |
@@ -115,7 +118,7 @@ CONFIG_SMC91X=y | |||
115 | CONFIG_SMC911X=y | 118 | CONFIG_SMC911X=y |
116 | CONFIG_SMSC911X=y | 119 | CONFIG_SMSC911X=y |
117 | # CONFIG_NET_VENDOR_STMICRO is not set | 120 | # CONFIG_NET_VENDOR_STMICRO is not set |
118 | # CONFIG_WLAN is not set | 121 | CONFIG_BRCMFMAC=m |
119 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 122 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
120 | CONFIG_INPUT_EVDEV=y | 123 | CONFIG_INPUT_EVDEV=y |
121 | CONFIG_INPUT_EVBUG=m | 124 | CONFIG_INPUT_EVBUG=m |