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