Rebased from upstream / out of band repository.
[librecmc/librecmc.git] / target / linux / generic / hack-4.19 / 251-sound_kconfig.patch
1 From da3c50704f14132f4adf80d48e9a4cd5d46e54c9 Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Fri, 7 Jul 2017 17:09:21 +0200
4 Subject: kconfig: owrt specifc dependencies
5
6 Signed-off-by: John Crispin <john@phrozen.org>
7 ---
8  crypto/Kconfig        | 10 +++++-----
9  drivers/bcma/Kconfig  |  1 +
10  drivers/ssb/Kconfig   |  3 ++-
11  lib/Kconfig           |  8 ++++----
12  net/netfilter/Kconfig |  2 +-
13  net/wireless/Kconfig  | 17 ++++++++++-------
14  sound/core/Kconfig    |  4 ++--
15  7 files changed, 25 insertions(+), 20 deletions(-)
16
17 --- a/crypto/Kconfig
18 +++ b/crypto/Kconfig
19 @@ -33,7 +33,7 @@ config CRYPTO_FIPS
20           this is.
21  
22  config CRYPTO_ALGAPI
23 -       tristate
24 +       tristate "ALGAPI"
25         select CRYPTO_ALGAPI2
26         help
27           This option provides the API for cryptographic algorithms.
28 @@ -42,7 +42,7 @@ config CRYPTO_ALGAPI2
29         tristate
30  
31  config CRYPTO_AEAD
32 -       tristate
33 +       tristate "AEAD"
34         select CRYPTO_AEAD2
35         select CRYPTO_ALGAPI
36  
37 @@ -53,7 +53,7 @@ config CRYPTO_AEAD2
38         select CRYPTO_RNG2
39  
40  config CRYPTO_BLKCIPHER
41 -       tristate
42 +       tristate "BLKCIPHER"
43         select CRYPTO_BLKCIPHER2
44         select CRYPTO_ALGAPI
45  
46 @@ -64,7 +64,7 @@ config CRYPTO_BLKCIPHER2
47         select CRYPTO_WORKQUEUE
48  
49  config CRYPTO_HASH
50 -       tristate
51 +       tristate "HASH"
52         select CRYPTO_HASH2
53         select CRYPTO_ALGAPI
54  
55 @@ -73,7 +73,7 @@ config CRYPTO_HASH2
56         select CRYPTO_ALGAPI2
57  
58  config CRYPTO_RNG
59 -       tristate
60 +       tristate "RNG"
61         select CRYPTO_RNG2
62         select CRYPTO_ALGAPI
63  
64 --- a/drivers/bcma/Kconfig
65 +++ b/drivers/bcma/Kconfig
66 @@ -16,6 +16,7 @@ if BCMA
67  # Support for Block-I/O. SELECT this from the driver that needs it.
68  config BCMA_BLOCKIO
69         bool
70 +       default y
71  
72  config BCMA_HOST_PCI_POSSIBLE
73         bool
74 --- a/drivers/ssb/Kconfig
75 +++ b/drivers/ssb/Kconfig
76 @@ -28,6 +28,7 @@ config SSB_SPROM
77  config SSB_BLOCKIO
78         bool
79         depends on SSB
80 +       default y
81  
82  config SSB_PCIHOST_POSSIBLE
83         bool
84 @@ -48,7 +49,7 @@ config SSB_PCIHOST
85  config SSB_B43_PCI_BRIDGE
86         bool
87         depends on SSB_PCIHOST
88 -       default n
89 +       default y
90  
91  config SSB_PCMCIAHOST_POSSIBLE
92         bool
93 --- a/lib/Kconfig
94 +++ b/lib/Kconfig
95 @@ -377,16 +377,16 @@ config BCH_CONST_T
96  # Textsearch support is select'ed if needed
97  #
98  config TEXTSEARCH
99 -       bool
100 +       bool "Textsearch support"
101  
102  config TEXTSEARCH_KMP
103 -       tristate
104 +       tristate "Textsearch KMP"
105  
106  config TEXTSEARCH_BM
107 -       tristate
108 +       tristate "Textsearch BM"
109  
110  config TEXTSEARCH_FSM
111 -       tristate
112 +       tristate "Textsearch FSM"
113  
114  config BTREE
115         bool
116 --- a/net/netfilter/Kconfig
117 +++ b/net/netfilter/Kconfig
118 @@ -10,7 +10,7 @@ config NETFILTER_INGRESS
119           infrastructure.
120  
121  config NETFILTER_NETLINK
122 -       tristate
123 +       tristate "Netfilter NFNETLINK interface"
124  
125  config NETFILTER_FAMILY_BRIDGE
126         bool
127 --- a/net/wireless/Kconfig
128 +++ b/net/wireless/Kconfig
129 @@ -1,5 +1,5 @@
130  config WIRELESS_EXT
131 -       bool
132 +       bool "Wireless extensions"
133  
134  config WEXT_CORE
135         def_bool y
136 @@ -11,10 +11,10 @@ config WEXT_PROC
137         depends on WEXT_CORE
138  
139  config WEXT_SPY
140 -       bool
141 +       bool "WEXT_SPY"
142  
143  config WEXT_PRIV
144 -       bool
145 +       bool "WEXT_PRIV"
146  
147  config CFG80211
148         tristate "cfg80211 - wireless configuration API"
149 @@ -202,7 +202,7 @@ config CFG80211_WEXT_EXPORT
150  endif # CFG80211
151  
152  config LIB80211
153 -       tristate
154 +       tristate "LIB80211"
155         default n
156         help
157           This options enables a library of common routines used
158 @@ -211,13 +211,16 @@ config LIB80211
159           Drivers should select this themselves if needed.
160  
161  config LIB80211_CRYPT_WEP
162 -       tristate
163 +       tristate "LIB80211_CRYPT_WEP"
164 +       select LIB80211
165  
166  config LIB80211_CRYPT_CCMP
167 -       tristate
168 +       tristate "LIB80211_CRYPT_CCMP"
169 +       select LIB80211
170  
171  config LIB80211_CRYPT_TKIP
172 -       tristate
173 +       tristate "LIB80211_CRYPT_TKIP"
174 +       select LIB80211
175  
176  config LIB80211_DEBUG
177         bool "lib80211 debugging messages"
178 --- a/sound/core/Kconfig
179 +++ b/sound/core/Kconfig
180 @@ -16,7 +16,7 @@ config SND_DMAENGINE_PCM
181         tristate
182  
183  config SND_HWDEP
184 -       tristate
185 +       tristate "Sound hardware support"
186  
187  config SND_SEQ_DEVICE
188         tristate
189 @@ -26,7 +26,7 @@ config SND_RAWMIDI
190         select SND_SEQ_DEVICE if SND_SEQUENCER != n
191  
192  config SND_COMPRESS_OFFLOAD
193 -       tristate
194 +       tristate "Compression offloading support"
195  
196  config SND_JACK
197         bool