Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / sound / drivers / Kconfig

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 83529b08d019804945972dd4e474fe9a33a78f5d..a78a8d045175bb65b4dc576612e289b36957b898 100644 (file)
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -4,6 +4,26 @@ menu "Generic devices"
        depends on SND!=n
 
 
+config SND_PCSP
+       tristate "Internal PC speaker support"
+       depends on X86_PC && HIGH_RES_TIMERS
+       depends on INPUT
+       depends on SND
+       select SND_PCM
+       help
+         If you don't have a sound card in your computer, you can include a
+         driver for the PC speaker which allows it to act like a primitive
+         sound card.
+         This driver also replaces the pcspkr driver for beeps.
+
+         You can compile this as a module which will be called snd-pcsp.
+
+         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.
+
 config SND_MPU401_UART
         tristate
         select SND_RAWMIDI
@@ -120,4 +140,16 @@ config SND_PORTMAN2X4
          To compile this driver as a module, choose M here: the module
          will be called snd-portman2x4.
 
+config SND_ML403_AC97CR
+       tristate "Xilinx ML403 AC97 Controller Reference"
+       depends on SND && XILINX_VIRTEX
+       select SND_AC97_CODEC
+       help
+         Say Y here to include support for the
+         opb_ac97_controller_ref_v1_00_a ip core found in Xilinx' ML403
+         reference design.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-ml403_ac97cr.
+
 endmenu