Skip to content

Commit

Permalink
snd-pcsp: adjust help texts to frighten users
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
Stas Sergeev authored and tiwai committed May 19, 2008
1 parent b8291ad commit 3ccee69
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
5 changes: 0 additions & 5 deletions sound/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions sound/drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 3ccee69

Please sign in to comment.