Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / sound / drivers / Kconfig

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 40ebd2f440562145989e02f3d55fce723f74d4d3..83529b08d019804945972dd4e474fe9a33a78f5d 100644 (file)
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -109,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