diff options
author | Arnd Bergmann <arnd@arndb.de> | 2024-07-09 08:21:26 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2024-07-09 08:21:26 +0200 |
commit | 05a01ce77349f60b8f8d8b09df4e02a99d1f16df (patch) | |
tree | 0a3f13ddc55034df23e6f8ba0ac96d53ed938604 /arch/arm64 | |
parent | 43528789a0b9df73b318e9e8cbab3138d0187f2c (diff) | |
parent | 465830ad25346aa7945e8e0ac5b8ca7d53217043 (diff) |
Merge tag 'imx-defconfig-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig change for 6.11:
- Enable a few drivers needed by TQMa7x/MBa7x and i.MX53 QSB/QSRB in
imx_v6_v7_defconfig
- Enable IWLWIFI driver support in arm64 defconfig
* tag 'imx-defconfig-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: defconfig: Enable the IWLWIFI driver
ARM: imx_v6_v7_defconfig: enable DRM_SII902X and DRM_DISPLAY_CONNECTOR
ARM: imx_v6_v7_defconfig: Enable drivers for TQMa7x/MBa7x
Link: https://lore.kernel.org/r/20240709012534.3106441-1-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 130e92902301..080739294b18 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -420,6 +420,9 @@ CONFIG_ATH11K_AHB=m CONFIG_ATH11K_PCI=m CONFIG_ATH12K=m CONFIG_BRCMFMAC=m +CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m |