Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / sound / drivers / Kconfig

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 7971285dfd5b9a75ce796c927df888072af482d6..75d4fe09fdf363fc2a9fe7ee06439330150c397a 100644 (file)
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -26,11 +26,7 @@ config SND_VX_LIB
 config SND_AC97_CODEC
        tristate
        select SND_PCM
-       select SND_AC97_BUS
-
-config SND_AC97_BUS
-       tristate
-
+       select AC97_BUS
 
 config SND_DUMMY
        tristate "Dummy (/dev/null) soundcard"
@@ -113,4 +109,27 @@ config SND_MPU401
          To compile this driver as a module, choose M here: the module
          will be called snd-mpu401.
 
+config SND_PORTMAN2X4
+       tristate "Portman 2x4 driver"
+       depends on SND && PARPORT
+       select SND_RAWMIDI
+       help
+         Say Y here to include support for Midiman Portman 2x4 parallel
+         port MIDI device.
+
+         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