Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

snd-pcsp: adjust help texts to frighten users

Browse source 
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>
This commit is contained in:
Stas Sergeev 2008-05-16 12:10:03 +02:00 committed by Takashi Iwai
parent b8291ad07a
commit 3ccee69019
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/Kconfig
View file

@ -28,11 +28,6 @@ config SOUND
and read <file:Documentation/sound/oss/README.modules>; the module and read <file:Documentation/sound/oss/README.modules>; the module
will be called soundcore. will be called soundcore.
I'm told that even without a sound card, you can make your computer
say more than an occasional beep, by programming the PC speaker.
Kernel patches and supporting utilities to do that are in the pcsp
package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
source "sound/oss/dmasound/Kconfig" source "sound/oss/dmasound/Kconfig"
if !M68K if !M68K

14
sound/drivers/Kconfig
View file

@ -5,7 +5,7 @@ menu "Generic devices"
config SND_PCSP config SND_PCSP
tristate "PC-Speaker support" tristate "PC-Speaker support (READ HELP!)"
depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
depends on INPUT depends on INPUT
depends on SND depends on SND
@ -18,11 +18,21 @@ config SND_PCSP
You can compile this as a module which will be called snd-pcsp. You can compile this as a module which will be called snd-pcsp.
WARNING: if you already have a soundcard, enabling this
driver may lead to a problem. Namely, it may get loaded
before the other sound driver of yours, making the
pc-speaker a default sound device. Which is likely not
what you want. To make this driver play nicely with other
sound driver, you can add this into your /etc/modprobe.conf:
options snd-pcsp index=2
You don't need this driver if you only want your pc-speaker to beep. You don't need this driver if you only want your pc-speaker to beep.
You don't need this driver if you have a tablet piezo beeper You don't need this driver if you have a tablet piezo beeper
in your PC instead of the real speaker. in your PC instead of the real speaker.
It should not hurt to say Y or M here in all other cases. Say N if you have a sound card.
Say M if you don't.
Say Y only if you really know what you do.
config SND_MPU401_UART config SND_MPU401_UART
tristate tristate