aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers
diff options
context:
space:
mode:
authorStas Sergeev <stsp@aknet.ru>2008-05-16 06:10:03 -0400
committerTakashi Iwai <tiwai@suse.de>2008-05-19 06:04:35 -0400
commit3ccee69019d3b23f02204f4c2cb3085f436da252 (patch)
tree50981fdeba270e8097db5c2345eaceee7c1bd922 /sound/drivers
parentb8291ad07a7f3b5b990900f0001198ac23ba893e (diff)
snd-pcsp: adjust help texts to frighten users
Added the warning text to the help of snd-pcsp about the possible problem with this driver so that user can know of the problem in advance. Also, removed the obsoleted text about ancient pc-speaker patch in CONFIG_SOUND help. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/Kconfig14
1 files changed, 12 insertions, 2 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 379bcb074463..d7ff28809867 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -5,7 +5,7 @@ menu "Generic devices"
5 5
6 6
7config SND_PCSP 7config SND_PCSP
8 tristate "PC-Speaker support" 8 tristate "PC-Speaker support (READ HELP!)"
9 depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS 9 depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
10 depends on INPUT 10 depends on INPUT
11 depends on SND 11 depends on SND
@@ -18,11 +18,21 @@ config SND_PCSP
18 18
19 You can compile this as a module which will be called snd-pcsp. 19 You can compile this as a module which will be called snd-pcsp.
20 20
21 WARNING: if you already have a soundcard, enabling this
22 driver may lead to a problem. Namely, it may get loaded
23 before the other sound driver of yours, making the
24 pc-speaker a default sound device. Which is likely not
25 what you want. To make this driver play nicely with other
26 sound driver, you can add this into your /etc/modprobe.conf:
27 options snd-pcsp index=2
28
21 You don't need this driver if you only want your pc-speaker to beep. 29 You don't need this driver if you only want your pc-speaker to beep.
22 You don't need this driver if you have a tablet piezo beeper 30 You don't need this driver if you have a tablet piezo beeper
23 in your PC instead of the real speaker. 31 in your PC instead of the real speaker.
24 32
25 It should not hurt to say Y or M here in all other cases. 33 Say N if you have a sound card.
34 Say M if you don't.
35 Say Y only if you really know what you do.
26 36
27config SND_MPU401_UART 37config SND_MPU401_UART
28 tristate 38 tristate