From dd9db439e0c4cb71c0d963c78613a4ab8f31e74a Mon Sep 17 00:00:00 2001 From: Oskar Viljasaar <oskar.viljasaar@iopsys.eu> Date: Tue, 19 Jan 2021 10:47:04 +0100 Subject: [PATCH] Import openwrt hack patch 251-sound_kconfig.patch --- crypto/Kconfig | 10 +++++----- drivers/bcma/Kconfig | 1 + drivers/ssb/Kconfig | 3 ++- lib/Kconfig | 8 ++++---- net/netfilter/Kconfig | 2 +- net/wireless/Kconfig | 17 ++++++++++------- sound/core/Kconfig | 4 ++-- 7 files changed, 25 insertions(+), 20 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 0fb9586766..069e95829d 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -33,7 +33,7 @@ config CRYPTO_FIPS this is. config CRYPTO_ALGAPI - tristate + tristate "ALGAPI" select CRYPTO_ALGAPI2 help This option provides the API for cryptographic algorithms. @@ -42,7 +42,7 @@ config CRYPTO_ALGAPI2 tristate config CRYPTO_AEAD - tristate + tristate "AEAD" select CRYPTO_AEAD2 select CRYPTO_ALGAPI @@ -53,7 +53,7 @@ config CRYPTO_AEAD2 select CRYPTO_RNG2 config CRYPTO_BLKCIPHER - tristate + tristate "BLKCIPHER" select CRYPTO_BLKCIPHER2 select CRYPTO_ALGAPI @@ -64,7 +64,7 @@ config CRYPTO_BLKCIPHER2 select CRYPTO_WORKQUEUE config CRYPTO_HASH - tristate + tristate "HASH" select CRYPTO_HASH2 select CRYPTO_ALGAPI @@ -73,7 +73,7 @@ config CRYPTO_HASH2 select CRYPTO_ALGAPI2 config CRYPTO_RNG - tristate + tristate "RNG" select CRYPTO_RNG2 select CRYPTO_ALGAPI diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig index b9558ff208..2e9732e5c5 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig @@ -16,6 +16,7 @@ if BCMA # Support for Block-I/O. SELECT this from the driver that needs it. config BCMA_BLOCKIO bool + default y config BCMA_HOST_PCI_POSSIBLE bool diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index df30e13232..1e73cce01e 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -28,6 +28,7 @@ config SSB_SPROM config SSB_BLOCKIO bool depends on SSB + default y config SSB_PCIHOST_POSSIBLE bool @@ -48,7 +49,7 @@ config SSB_PCIHOST config SSB_B43_PCI_BRIDGE bool depends on SSB_PCIHOST - default n + default y config SSB_PCMCIAHOST_POSSIBLE bool diff --git a/lib/Kconfig b/lib/Kconfig index dc94ce05f8..3214d50eae 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -377,16 +377,16 @@ config BCH_CONST_T # Textsearch support is select'ed if needed # config TEXTSEARCH - bool + bool "Textsearch support" config TEXTSEARCH_KMP - tristate + tristate "Textsearch KMP" config TEXTSEARCH_BM - tristate + tristate "Textsearch BM" config TEXTSEARCH_FSM - tristate + tristate "Textsearch FSM" config BTREE bool diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 40d4ff6cad..879cec8e87 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -10,7 +10,7 @@ config NETFILTER_INGRESS infrastructure. config NETFILTER_NETLINK - tristate + tristate "Netfilter NFNETLINK interface" config NETFILTER_FAMILY_BRIDGE bool diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 41722046b9..f6a88fa837 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -1,5 +1,5 @@ config WIRELESS_EXT - bool + bool "Wireless extensions" config WEXT_CORE def_bool y @@ -11,10 +11,10 @@ config WEXT_PROC depends on WEXT_CORE config WEXT_SPY - bool + bool "WEXT_SPY" config WEXT_PRIV - bool + bool "WEXT_PRIV" config CFG80211 tristate "cfg80211 - wireless configuration API" @@ -202,7 +202,7 @@ config CFG80211_WEXT_EXPORT endif # CFG80211 config LIB80211 - tristate + tristate "LIB80211" default n help This options enables a library of common routines used @@ -211,13 +211,16 @@ config LIB80211 Drivers should select this themselves if needed. config LIB80211_CRYPT_WEP - tristate + tristate "LIB80211_CRYPT_WEP" + select LIB80211 config LIB80211_CRYPT_CCMP - tristate + tristate "LIB80211_CRYPT_CCMP" + select LIB80211 config LIB80211_CRYPT_TKIP - tristate + tristate "LIB80211_CRYPT_TKIP" + select LIB80211 config LIB80211_DEBUG bool "lib80211 debugging messages" diff --git a/sound/core/Kconfig b/sound/core/Kconfig index 63b3ef9c83..8a53b5264a 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig @@ -16,7 +16,7 @@ config SND_DMAENGINE_PCM tristate config SND_HWDEP - tristate + tristate "Sound hardware support" config SND_SEQ_DEVICE tristate @@ -26,7 +26,7 @@ config SND_RAWMIDI select SND_SEQ_DEVICE if SND_SEQUENCER != n config SND_COMPRESS_OFFLOAD - tristate + tristate "Compression offloading support" config SND_JACK bool -- GitLab