summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-10-09 16:12:15 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-10-09 16:12:15 +1100
commitea928ea34c7cf9c5e3b1f088acfb830b62682aee (patch)
treeb9c4aaa40b1b778543a3c7e5386d207394dddb06 /sound
parent8f889bcf66020234b164b9552c208fe5f626dca4 (diff)
parentcfdb1bf3eaa79e7280d85c5e7fa9cdb899e101bd (diff)
Merge remote branch 'tip/auto-latest'
Conflicts: drivers/mtd/maps/gpio-addr-flash.c
Diffstat (limited to 'sound')
-rw-r--r--sound/drivers/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 84714a65e5c8..491e0d7f3914 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -91,6 +91,8 @@ config SND_VIRMIDI
config SND_MTPAV
tristate "MOTU MidiTimePiece AV multiport MIDI"
+ # sometimes crashes
+ depends on 0
select SND_RAWMIDI
help
To use a MOTU MidiTimePiece AV multiport MIDI adapter