# HG changeset patch # User Stas Sergeev # Date 1210878004 -14400 # Node ID 26bbbefc222c5a7fffc15c34422ff0408a4d6dc3 # Parent 903c7be2316a6b892c8c20a0a8a6e21cd9a9ee8c snd-pcsp: adjust help texts to frighten users. Signed-off-by: Stas Sergeev diff -r 903c7be2316a -r 26bbbefc222c Kconfig --- a/Kconfig Thu May 08 21:20:04 2008 +0400 +++ b/Kconfig Thu May 15 23:00:04 2008 +0400 @@ -27,11 +27,6 @@ config SOUND after the PnP configuration is finished. To do this, choose M here and read ; 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 . source "sound/oss/dmasound/Kconfig" diff -r 903c7be2316a -r 26bbbefc222c drivers/Kconfig --- a/drivers/Kconfig Thu May 08 21:20:04 2008 +0400 +++ b/drivers/Kconfig Thu May 15 23:00:04 2008 +0400 @@ -5,7 +5,7 @@ menu "Generic devices" config SND_PCSP - tristate "PC-Speaker support" + tristate "PC-Speaker support (READ HELP!)" depends on X86_PC && HIGH_RES_TIMERS depends on SND select SND_PCM @@ -17,11 +17,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_PCSP_INPUT def_bool y