Commit
5bae4199522c56110d33e6fd925c052bc5ae36a1
Exists in
master
and in
39 other branches
8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y
pcsp - Don't build pcspkr when snd-pcsp is enabled
- Update CREDITS with the pc-speaker driver authors.
- Prevent pcspkr from being built together with snd-pcsp.
Both pcspkr and snd-pcsp use the same platform driver name "pcspkr".
Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Showing
2 changed files
with
9 additions
and
0 deletions
Side-by-side Diff
| ... |
... |
@@ -403,6 +403,8 @@ |
|
403
|
403 |
N: Erik Inge Bolsø |
|
404
|
404 |
E: knan@mo.himolde.no |
|
405
|
405 |
D: Misc kernel hacks |
|
|
406 |
+D: Updated PC speaker driver for 2.3 |
|
|
407 |
+S: Norway |
|
406
|
408 |
|
|
407
|
409 |
N: Andreas E. Bombe |
|
408
|
410 |
E: andreas.bombe@munich.netsurf.de |
| ... |
... |
@@ -3115,6 +3117,12 @@ |
|
3115
|
3117 |
S: Post Office Box 64132 |
|
3116
|
3118 |
S: Sunnyvale, California 94088-4132 |
|
3117
|
3119 |
S: USA |
|
|
3120 |
+ |
|
|
3121 |
+N: Stas Sergeev |
|
|
3122 |
+E: stsp@users.sourceforge.net |
|
|
3123 |
+D: PCM PC-Speaker driver |
|
|
3124 |
+D: misc fixes |
|
|
3125 |
+S: Russia |
|
3118
|
3126 |
|
|
3119
|
3127 |
N: Simon Shapiro |
|
3120
|
3128 |
E: shimon@i-Connect.Net |
| ... |
... |
@@ -15,6 +15,7 @@ |
|
15
|
15 |
config INPUT_PCSPKR |
|
16
|
16 |
tristate "PC Speaker support" |
|
17
|
17 |
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES |
|
|
18 |
+ depends on SND_PCSP=n |
|
18
|
19 |
help |
|
19
|
20 |
Say Y here if you want the standard PC Speaker to be used for |
|
20
|
21 |
bells and whistles. |
Takashi Iwai