kernel: split patches folder up into backport, pending and hack folders
[oweals/openwrt.git] / target / linux / generic / hack-4.9 / 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 diff --git a/crypto/Kconfig b/crypto/Kconfig
18 index 84d71482bf08..e3552d1c1b84 100644
19 --- a/crypto/Kconfig
20 +++ b/crypto/Kconfig
21 @@ -32,7 +32,7 @@ config CRYPTO_FIPS
22           this is.
23  
24  config CRYPTO_ALGAPI
25 -       tristate
26 +       tristate "ALGAPI"
27         select CRYPTO_ALGAPI2
28         help
29           This option provides the API for cryptographic algorithms.
30 @@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
31         tristate
32  
33  config CRYPTO_AEAD
34 -       tristate
35 +       tristate "AEAD"
36         select CRYPTO_AEAD2
37         select CRYPTO_ALGAPI
38  
39 @@ -52,7 +52,7 @@ config CRYPTO_AEAD2
40         select CRYPTO_RNG2
41  
42  config CRYPTO_BLKCIPHER
43 -       tristate
44 +       tristate "BLKCIPHER"
45         select CRYPTO_BLKCIPHER2
46         select CRYPTO_ALGAPI
47  
48 @@ -63,7 +63,7 @@ config CRYPTO_BLKCIPHER2
49         select CRYPTO_WORKQUEUE
50  
51  config CRYPTO_HASH
52 -       tristate
53 +       tristate "HASH"
54         select CRYPTO_HASH2
55         select CRYPTO_ALGAPI
56  
57 @@ -72,7 +72,7 @@ config CRYPTO_HASH2
58         select CRYPTO_ALGAPI2
59  
60  config CRYPTO_RNG
61 -       tristate
62 +       tristate "RNG"
63         select CRYPTO_RNG2
64         select CRYPTO_ALGAPI
65  
66 diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
67 index b5c48a8d485f..6cb52081b9ef 100644
68 --- a/drivers/bcma/Kconfig
69 +++ b/drivers/bcma/Kconfig
70 @@ -17,6 +17,7 @@ config BCMA
71  config BCMA_BLOCKIO
72         bool
73         depends on BCMA
74 +       default y
75  
76  config BCMA_HOST_PCI_POSSIBLE
77         bool
78 diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
79 index d8e4219c2324..a20c168cb7c2 100644
80 --- a/drivers/ssb/Kconfig
81 +++ b/drivers/ssb/Kconfig
82 @@ -29,6 +29,7 @@ config SSB_SPROM
83  config SSB_BLOCKIO
84         bool
85         depends on SSB
86 +       default y
87  
88  config SSB_PCIHOST_POSSIBLE
89         bool
90 @@ -49,7 +50,7 @@ config SSB_PCIHOST
91  config SSB_B43_PCI_BRIDGE
92         bool
93         depends on SSB_PCIHOST
94 -       default n
95 +       default y
96  
97  config SSB_PCMCIAHOST_POSSIBLE
98         bool
99 diff --git a/lib/Kconfig b/lib/Kconfig
100 index 260a80e313b9..d1b788fff727 100644
101 --- a/lib/Kconfig
102 +++ b/lib/Kconfig
103 @@ -334,16 +334,16 @@ config BCH_CONST_T
104  # Textsearch support is select'ed if needed
105  #
106  config TEXTSEARCH
107 -       bool
108 +       boolean "Textsearch support"
109  
110  config TEXTSEARCH_KMP
111 -       tristate
112 +       tristate "Textsearch KMP"
113  
114  config TEXTSEARCH_BM
115 -       tristate
116 +       tristate "Textsearch BM"
117  
118  config TEXTSEARCH_FSM
119 -       tristate
120 +       tristate "Textsearch FSM"
121  
122  config BTREE
123         bool
124 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
125 index e8d56d9a4df2..0fb924661988 100644
126 --- a/net/netfilter/Kconfig
127 +++ b/net/netfilter/Kconfig
128 @@ -10,7 +10,7 @@ config NETFILTER_INGRESS
129           infrastructure.
130  
131  config NETFILTER_NETLINK
132 -       tristate
133 +       tristate "Netfilter NFNETLINK interface"
134  
135  config NETFILTER_NETLINK_ACCT
136  tristate "Netfilter NFACCT over NFNETLINK interface"
137 diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
138 index 6c606120abfe..bd299de9440c 100644
139 --- a/net/wireless/Kconfig
140 +++ b/net/wireless/Kconfig
141 @@ -1,5 +1,5 @@
142  config WIRELESS_EXT
143 -       bool
144 +       bool "Wireless extensions"
145  
146  config WEXT_CORE
147         def_bool y
148 @@ -11,10 +11,10 @@ config WEXT_PROC
149         depends on WEXT_CORE
150  
151  config WEXT_SPY
152 -       bool
153 +       bool "WEXT_SPY"
154  
155  config WEXT_PRIV
156 -       bool
157 +       bool "WEXT_PRIV"
158  
159  config CFG80211
160         tristate "cfg80211 - wireless configuration API"
161 @@ -188,7 +188,7 @@ config CFG80211_WEXT_EXPORT
162           wext compatibility symbols to be exported.
163  
164  config LIB80211
165 -       tristate
166 +       tristate "LIB80211"
167         default n
168         help
169           This options enables a library of common routines used
170 @@ -197,13 +197,16 @@ config LIB80211
171           Drivers should select this themselves if needed.
172  
173  config LIB80211_CRYPT_WEP
174 -       tristate
175 +       tristate "LIB80211_CRYPT_WEP"
176 +       select LIB80211
177  
178  config LIB80211_CRYPT_CCMP
179 -       tristate
180 +       tristate "LIB80211_CRYPT_CCMP"
181 +       select LIB80211
182  
183  config LIB80211_CRYPT_TKIP
184 -       tristate
185 +       tristate "LIB80211_CRYPT_TKIP"
186 +       select LIB80211
187  
188  config LIB80211_DEBUG
189         bool "lib80211 debugging messages"
190 diff --git a/sound/core/Kconfig b/sound/core/Kconfig
191 index 9749f9e8b45c..9639a67e7e9b 100644
192 --- a/sound/core/Kconfig
193 +++ b/sound/core/Kconfig
194 @@ -16,13 +16,13 @@ config SND_DMAENGINE_PCM
195         tristate
196  
197  config SND_HWDEP
198 -       tristate
199 +       tristate "Sound hardware support"
200  
201  config SND_RAWMIDI
202         tristate
203  
204  config SND_COMPRESS_OFFLOAD
205 -       tristate
206 +       tristate "Compression offloading support"
207  
208  config SND_JACK
209         bool
210 -- 
211 2.11.0
212