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

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

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 395c4ef52ac9b04e7d5e288090d6153182353984..83529b08d019804945972dd4e474fe9a33a78f5d 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"
@@ -73,6 +69,19 @@ config SND_MTPAV
          To compile this driver as a module, choose M here: the module
          will be called snd-mtpav.
 
+config SND_MTS64
+       tristate "ESI Miditerminal 4140 driver"
+       depends on SND && PARPORT
+       select SND_RAWMIDI
+       help
+         The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with 
+          additional SMPTE Timecode capabilities for the parallel port.
+
+         Say 'Y' to include support for this device.
+
+         To compile this driver as a module, chose 'M' here: the module 
+          will be called snd-mts64.
+
 config SND_SERIAL_U16550
        tristate "UART16550 serial MIDI driver"
        depends on SND
@@ -100,4 +109,15 @@ 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.
+
 endmenu