251-sound_kconfig.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212
  1. From da3c50704f14132f4adf80d48e9a4cd5d46e54c9 Mon Sep 17 00:00:00 2001
  2. From: John Crispin <[email protected]>
  3. Date: Fri, 7 Jul 2017 17:09:21 +0200
  4. Subject: kconfig: owrt specifc dependencies
  5. Signed-off-by: John Crispin <[email protected]>
  6. ---
  7. crypto/Kconfig | 10 +++++-----
  8. drivers/bcma/Kconfig | 1 +
  9. drivers/ssb/Kconfig | 3 ++-
  10. lib/Kconfig | 8 ++++----
  11. net/netfilter/Kconfig | 2 +-
  12. net/wireless/Kconfig | 17 ++++++++++-------
  13. sound/core/Kconfig | 4 ++--
  14. 7 files changed, 25 insertions(+), 20 deletions(-)
  15. diff --git a/crypto/Kconfig b/crypto/Kconfig
  16. index 84d71482bf08..e3552d1c1b84 100644
  17. --- a/crypto/Kconfig
  18. +++ b/crypto/Kconfig
  19. @@ -32,7 +32,7 @@ config CRYPTO_FIPS
  20. this is.
  21. config CRYPTO_ALGAPI
  22. - tristate
  23. + tristate "ALGAPI"
  24. select CRYPTO_ALGAPI2
  25. help
  26. This option provides the API for cryptographic algorithms.
  27. @@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
  28. tristate
  29. config CRYPTO_AEAD
  30. - tristate
  31. + tristate "AEAD"
  32. select CRYPTO_AEAD2
  33. select CRYPTO_ALGAPI
  34. @@ -52,7 +52,7 @@ config CRYPTO_AEAD2
  35. select CRYPTO_RNG2
  36. config CRYPTO_BLKCIPHER
  37. - tristate
  38. + tristate "BLKCIPHER"
  39. select CRYPTO_BLKCIPHER2
  40. select CRYPTO_ALGAPI
  41. @@ -63,7 +63,7 @@ config CRYPTO_BLKCIPHER2
  42. select CRYPTO_WORKQUEUE
  43. config CRYPTO_HASH
  44. - tristate
  45. + tristate "HASH"
  46. select CRYPTO_HASH2
  47. select CRYPTO_ALGAPI
  48. @@ -72,7 +72,7 @@ config CRYPTO_HASH2
  49. select CRYPTO_ALGAPI2
  50. config CRYPTO_RNG
  51. - tristate
  52. + tristate "RNG"
  53. select CRYPTO_RNG2
  54. select CRYPTO_ALGAPI
  55. diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
  56. index b5c48a8d485f..6cb52081b9ef 100644
  57. --- a/drivers/bcma/Kconfig
  58. +++ b/drivers/bcma/Kconfig
  59. @@ -17,6 +17,7 @@ config BCMA
  60. config BCMA_BLOCKIO
  61. bool
  62. depends on BCMA
  63. + default y
  64. config BCMA_HOST_PCI_POSSIBLE
  65. bool
  66. diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
  67. index d8e4219c2324..a20c168cb7c2 100644
  68. --- a/drivers/ssb/Kconfig
  69. +++ b/drivers/ssb/Kconfig
  70. @@ -29,6 +29,7 @@ config SSB_SPROM
  71. config SSB_BLOCKIO
  72. bool
  73. depends on SSB
  74. + default y
  75. config SSB_PCIHOST_POSSIBLE
  76. bool
  77. @@ -49,7 +50,7 @@ config SSB_PCIHOST
  78. config SSB_B43_PCI_BRIDGE
  79. bool
  80. depends on SSB_PCIHOST
  81. - default n
  82. + default y
  83. config SSB_PCMCIAHOST_POSSIBLE
  84. bool
  85. diff --git a/lib/Kconfig b/lib/Kconfig
  86. index 260a80e313b9..d1b788fff727 100644
  87. --- a/lib/Kconfig
  88. +++ b/lib/Kconfig
  89. @@ -334,16 +334,16 @@ config BCH_CONST_T
  90. # Textsearch support is select'ed if needed
  91. #
  92. config TEXTSEARCH
  93. - bool
  94. + boolean "Textsearch support"
  95. config TEXTSEARCH_KMP
  96. - tristate
  97. + tristate "Textsearch KMP"
  98. config TEXTSEARCH_BM
  99. - tristate
  100. + tristate "Textsearch BM"
  101. config TEXTSEARCH_FSM
  102. - tristate
  103. + tristate "Textsearch FSM"
  104. config BTREE
  105. bool
  106. diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
  107. index e8d56d9a4df2..0fb924661988 100644
  108. --- a/net/netfilter/Kconfig
  109. +++ b/net/netfilter/Kconfig
  110. @@ -10,7 +10,7 @@ config NETFILTER_INGRESS
  111. infrastructure.
  112. config NETFILTER_NETLINK
  113. - tristate
  114. + tristate "Netfilter NFNETLINK interface"
  115. config NETFILTER_NETLINK_ACCT
  116. tristate "Netfilter NFACCT over NFNETLINK interface"
  117. diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
  118. index 6c606120abfe..bd299de9440c 100644
  119. --- a/net/wireless/Kconfig
  120. +++ b/net/wireless/Kconfig
  121. @@ -1,5 +1,5 @@
  122. config WIRELESS_EXT
  123. - bool
  124. + bool "Wireless extensions"
  125. config WEXT_CORE
  126. def_bool y
  127. @@ -11,10 +11,10 @@ config WEXT_PROC
  128. depends on WEXT_CORE
  129. config WEXT_SPY
  130. - bool
  131. + bool "WEXT_SPY"
  132. config WEXT_PRIV
  133. - bool
  134. + bool "WEXT_PRIV"
  135. config CFG80211
  136. tristate "cfg80211 - wireless configuration API"
  137. @@ -188,7 +188,7 @@ config CFG80211_WEXT_EXPORT
  138. wext compatibility symbols to be exported.
  139. config LIB80211
  140. - tristate
  141. + tristate "LIB80211"
  142. default n
  143. help
  144. This options enables a library of common routines used
  145. @@ -197,13 +197,16 @@ config LIB80211
  146. Drivers should select this themselves if needed.
  147. config LIB80211_CRYPT_WEP
  148. - tristate
  149. + tristate "LIB80211_CRYPT_WEP"
  150. + select LIB80211
  151. config LIB80211_CRYPT_CCMP
  152. - tristate
  153. + tristate "LIB80211_CRYPT_CCMP"
  154. + select LIB80211
  155. config LIB80211_CRYPT_TKIP
  156. - tristate
  157. + tristate "LIB80211_CRYPT_TKIP"
  158. + select LIB80211
  159. config LIB80211_DEBUG
  160. bool "lib80211 debugging messages"
  161. diff --git a/sound/core/Kconfig b/sound/core/Kconfig
  162. index 9749f9e8b45c..9639a67e7e9b 100644
  163. --- a/sound/core/Kconfig
  164. +++ b/sound/core/Kconfig
  165. @@ -16,13 +16,13 @@ config SND_DMAENGINE_PCM
  166. tristate
  167. config SND_HWDEP
  168. - tristate
  169. + tristate "Sound hardware support"
  170. config SND_RAWMIDI
  171. tristate
  172. config SND_COMPRESS_OFFLOAD
  173. - tristate
  174. + tristate "Compression offloading support"
  175. config SND_JACK
  176. bool
  177. --
  178. 2.11.0