Skip to content

Commit 3082a78

Browse files
committed
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>
2 parents 3f43257 + e7d7b03 commit 3082a78

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

arch/arm/configs/omap2plus_defconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ CONFIG_BT_MRVL_SDIO=m
276276
CONFIG_AF_RXRPC=m
277277
CONFIG_RXKAD=y
278278
CONFIG_CFG80211=m
279+
CONFIG_CFG80211_WEXT=y
279280
CONFIG_MAC80211=m
280281
CONFIG_PCI=y
281282
CONFIG_PCI_MSI=y
@@ -374,6 +375,8 @@ CONFIG_LIBERTAS_DEBUG=y
374375
CONFIG_MWIFIEX=m
375376
CONFIG_MWIFIEX_SDIO=m
376377
CONFIG_MWIFIEX_USB=m
378+
CONFIG_WL1251=m
379+
CONFIG_WL1251_SPI=m
377380
CONFIG_WL12XX=m
378381
CONFIG_WL18XX=m
379382
CONFIG_WLCORE_SPI=m
@@ -617,6 +620,8 @@ CONFIG_LEDS_CLASS=m
617620
CONFIG_LEDS_CPCAP=m
618621
CONFIG_LEDS_LM3532=m
619622
CONFIG_LEDS_GPIO=m
623+
CONFIG_LEDS_LP55XX_COMMON=m
624+
CONFIG_LEDS_LP5523=m
620625
CONFIG_LEDS_PCA963X=m
621626
CONFIG_LEDS_PWM=m
622627
CONFIG_LEDS_TRIGGERS=y

0 commit comments

Comments
 (0)