diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /sound/drivers/Kconfig | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/drivers/Kconfig')
| -rw-r--r-- | sound/drivers/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index 395c4ef52ac9..7971285dfd5b 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig | |||
| @@ -73,6 +73,19 @@ config SND_MTPAV | |||
| 73 | To compile this driver as a module, choose M here: the module | 73 | To compile this driver as a module, choose M here: the module |
| 74 | will be called snd-mtpav. | 74 | will be called snd-mtpav. |
| 75 | 75 | ||
| 76 | config SND_MTS64 | ||
| 77 | tristate "ESI Miditerminal 4140 driver" | ||
| 78 | depends on SND && PARPORT | ||
| 79 | select SND_RAWMIDI | ||
| 80 | help | ||
| 81 | The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with | ||
| 82 | additional SMPTE Timecode capabilities for the parallel port. | ||
| 83 | |||
| 84 | Say 'Y' to include support for this device. | ||
| 85 | |||
| 86 | To compile this driver as a module, chose 'M' here: the module | ||
| 87 | will be called snd-mts64. | ||
| 88 | |||
| 76 | config SND_SERIAL_U16550 | 89 | config SND_SERIAL_U16550 |
| 77 | tristate "UART16550 serial MIDI driver" | 90 | tristate "UART16550 serial MIDI driver" |
| 78 | depends on SND | 91 | depends on SND |