Commit 3082a785 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v5.14/defconfig-signed' of...

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-2Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3f43257e e7d7b033
...@@ -276,6 +276,7 @@ CONFIG_BT_MRVL_SDIO=m ...@@ -276,6 +276,7 @@ CONFIG_BT_MRVL_SDIO=m
CONFIG_AF_RXRPC=m CONFIG_AF_RXRPC=m
CONFIG_RXKAD=y CONFIG_RXKAD=y
CONFIG_CFG80211=m CONFIG_CFG80211=m
CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=m CONFIG_MAC80211=m
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
...@@ -374,6 +375,8 @@ CONFIG_LIBERTAS_DEBUG=y ...@@ -374,6 +375,8 @@ CONFIG_LIBERTAS_DEBUG=y
CONFIG_MWIFIEX=m CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_USB=m CONFIG_MWIFIEX_USB=m
CONFIG_WL1251=m
CONFIG_WL1251_SPI=m
CONFIG_WL12XX=m CONFIG_WL12XX=m
CONFIG_WL18XX=m CONFIG_WL18XX=m
CONFIG_WLCORE_SPI=m CONFIG_WLCORE_SPI=m
...@@ -617,6 +620,8 @@ CONFIG_LEDS_CLASS=m ...@@ -617,6 +620,8 @@ CONFIG_LEDS_CLASS=m
CONFIG_LEDS_CPCAP=m CONFIG_LEDS_CPCAP=m
CONFIG_LEDS_LM3532=m CONFIG_LEDS_LM3532=m
CONFIG_LEDS_GPIO=m CONFIG_LEDS_GPIO=m
CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PCA963X=m
CONFIG_LEDS_PWM=m CONFIG_LEDS_PWM=m
CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGERS=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment