diff options
| author | Stas Sergeev <stsp@aknet.ru> | 2008-05-16 12:10:03 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-05-19 12:04:35 +0200 |
| commit | 3ccee69019d3b23f02204f4c2cb3085f436da252 (patch) | |
| tree | 50981fdeba270e8097db5c2345eaceee7c1bd922 /sound | |
| parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) | |
| download | blackbird-op-linux-3ccee69019d3b23f02204f4c2cb3085f436da252.tar.gz blackbird-op-linux-3ccee69019d3b23f02204f4c2cb3085f436da252.zip | |
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')
| -rw-r--r-- | sound/Kconfig | 5 | ||||
| -rw-r--r-- | sound/drivers/Kconfig | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index b2a2db47aff5..4247406160e7 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -28,11 +28,6 @@ config SOUND and read <file:Documentation/sound/oss/README.modules>; the module 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" if !M68K 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" config SND_PCSP - tristate "PC-Speaker support" + tristate "PC-Speaker support (READ HELP!)" depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS depends on INPUT depends on SND @@ -18,11 +18,21 @@ config 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 have a tablet piezo beeper 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 tristate |
