diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-12 08:32:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-12 08:32:57 -0700 |
| commit | 3082a78502f6cc9e599f01e93c9d0f13f33c21e4 (patch) | |
| tree | d440783ffeb07779d5466de9bde7ed31df1f0ac8 /arch/arm | |
| parent | 3f43257e3c06ba185055279745f88d4c99801664 (diff) | |
| parent | e7d7b033091afaee937cd92d71903fbe774d5ff0 (diff) | |
| download | linux-stable-3082a78502f6cc9e599f01e93c9d0f13f33c21e4.tar.gz linux-stable-3082a78502f6cc9e599f01e93c9d0f13f33c21e4.tar.bz2 linux-stable-3082a78502f6cc9e599f01e93c9d0f13f33c21e4.zip | |
Merge tag 'omap-for-v5.14/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/defconfig
Defconfig changes for omaps for v5.14 merge window
Defconfig changes for omap2plus_defconfig to add WL1251
and LP5523 as loadable modules for n900.
* tag 'omap-for-v5.14/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Add LP5523 LED driver
ARM: omap2plus_defconfig: Add WL1251 and WEXT modules
Link: https://lore.kernel.org/r/pull-1622618286-677305@atomide.com-2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 77b4bea12feb..2ac2418084ab 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -276,6 +276,7 @@ CONFIG_BT_MRVL_SDIO=m CONFIG_AF_RXRPC=m CONFIG_RXKAD=y CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m CONFIG_PCI=y CONFIG_PCI_MSI=y @@ -374,6 +375,8 @@ CONFIG_LIBERTAS_DEBUG=y CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE_SPI=m @@ -617,6 +620,8 @@ CONFIG_LEDS_CLASS=m CONFIG_LEDS_CPCAP=m CONFIG_LEDS_LM3532=m CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5523=m CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PWM=m CONFIG_LEDS_TRIGGERS=y |