From da3c50704f14132f4adf80d48e9a4cd5d46e54c9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 7 Jul 2017 17:09:21 +0200 Subject: kconfig: owrt specifc dependencies Signed-off-by: John Crispin --- 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 84d71482bf08..e3552d1c1b84 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -32,7 +32,7 @@ config CRYPTO_FIPS this is. config CRYPTO_ALGAPI - tristate + tristate "ALGAPI" select CRYPTO_ALGAPI2 help This option provides the API for cryptographic algorithms. @@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2 tristate config CRYPTO_AEAD - tristate + tristate "AEAD" select CRYPTO_AEAD2 select CRYPTO_ALGAPI @@ -52,7 +52,7 @@ config CRYPTO_AEAD2 select CRYPTO_RNG2 config CRYPTO_BLKCIPHER - tristate + tristate "BLKCIPHER" select CRYPTO_BLKCIPHER2 select CRYPTO_ALGAPI @@ -63,7 +63,7 @@ config CRYPTO_BLKCIPHER2 select CRYPTO_WORKQUEUE config CRYPTO_HASH - tristate + tristate "HASH" select CRYPTO_HASH2 select CRYPTO_ALGAPI @@ -72,7 +72,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 b5c48a8d485f..6cb52081b9ef 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig @@ -17,6 +17,7 @@ config BCMA config BCMA_BLOCKIO bool depends on BCMA + default y config BCMA_HOST_PCI_POSSIBLE bool diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index d8e4219c2324..a20c168cb7c2 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -29,6 +29,7 @@ config SSB_SPROM config SSB_BLOCKIO bool depends on SSB + default y config SSB_PCIHOST_POSSIBLE bool @@ -49,7 +50,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 260a80e313b9..d1b788fff727 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -334,16 +334,16 @@ config BCH_CONST_T # Textsearch support is select'ed if needed # config TEXTSEARCH - bool + boolean "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 e8d56d9a4df2..0fb924661988 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_NETLINK_ACCT tristate "Netfilter NFACCT over NFNETLINK interface" diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 6c606120abfe..bd299de9440c 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" @@ -188,7 +188,7 @@ config CFG80211_WEXT_EXPORT wext compatibility symbols to be exported. config LIB80211 - tristate + tristate "LIB80211" default n help This options enables a library of common routines used @@ -197,13 +197,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 9749f9e8b45c..9639a67e7e9b 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig @@ -16,13 +16,13 @@ config SND_DMAENGINE_PCM tristate config SND_HWDEP - tristate + tristate "Sound hardware support" config SND_RAWMIDI tristate config SND_COMPRESS_OFFLOAD - tristate + tristate "Compression offloading support" config SND_JACK bool -- 2.11.0