diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-15 08:12:13 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-15 08:12:14 -0700 |
| commit | dfde897bb1d5fe91824ace4aa3ed21c52081fdbe (patch) | |
| tree | 827f4127b7c353ccc3c24b568c361e0d0fae86f4 /arch/arm | |
| parent | ad9f81281ebe840a6cf55302fc058d3e3b7399ff (diff) | |
| parent | 6252a42b0fd70b03aa17c58d218dcabd863cc02a (diff) | |
| download | linux-stable-dfde897bb1d5fe91824ace4aa3ed21c52081fdbe.tar.gz linux-stable-dfde897bb1d5fe91824ace4aa3ed21c52081fdbe.tar.bz2 linux-stable-dfde897bb1d5fe91824ace4aa3ed21c52081fdbe.zip | |
Merge tag 'imx-defconfig-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.14:
- Enable LT8912B DRM bridge and Layerscape EDAC driver support in arm64
defconfig.
- Enable WiFi ath10k SDIO driver in imx_v6_v7_defconfig.
* tag 'imx-defconfig-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: Select the Wifi ath10k sdio driver
arm64: defconfig: enable Layerscape EDAC driver
arm64: defconfig: Enable LT8912B DRM bridge driver
Link: https://lore.kernel.org/r/20210613082544.16067-6-shawnguo@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 70928cc48939..079fcd8d1d11 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -150,6 +150,8 @@ CONFIG_USB_USBNET=y CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_NET_MCS7830=y +CONFIG_ATH10K=m +CONFIG_ATH10K_SDIO=m CONFIG_BRCMFMAC=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m |