aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbmidi.c
diff options
context:
space:
mode:
authorBen Williamson <ben.williamson@greyinnovation.com>2006-06-19 11:20:09 -0400
committerJaroslav Kysela <perex@suse.cz>2006-06-22 15:34:31 -0400
commitc4a87ef4de9860d00460dce30776f7cc17e77459 (patch)
tree3cb5fc7db428e75e1c8545f890d76b11390465a2 /sound/usb/usbmidi.c
parent1561f09a2f91bc258a72225f919807c9e51c8290 (diff)
[ALSA] USB midi: Remove duplicate CS_AUDIO_* #defines
Removed the CS_AUDIO_* #defines, which were duplicates of the class-specific USB_DT_CS_* #defines in <linux/usb_ch9.h>. Signed-off-by: Ben Williamson <ben.williamson@greyinnovation.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usbmidi.c')
-rw-r--r--sound/usb/usbmidi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 5c53ec8a13bf..5105b6b05748 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1413,7 +1413,7 @@ static int snd_usbmidi_detect_yamaha(struct snd_usb_midi* umidi,
1413 for (cs_desc = hostif->extra; 1413 for (cs_desc = hostif->extra;
1414 cs_desc < hostif->extra + hostif->extralen && cs_desc[0] >= 2; 1414 cs_desc < hostif->extra + hostif->extralen && cs_desc[0] >= 2;
1415 cs_desc += cs_desc[0]) { 1415 cs_desc += cs_desc[0]) {
1416 if (cs_desc[1] == CS_AUDIO_INTERFACE) { 1416 if (cs_desc[1] == USB_DT_CS_INTERFACE) {
1417 if (cs_desc[2] == MIDI_IN_JACK) 1417 if (cs_desc[2] == MIDI_IN_JACK)
1418 endpoint->in_cables = (endpoint->in_cables << 1) | 1; 1418 endpoint->in_cables = (endpoint->in_cables << 1) | 1;
1419 else if (cs_desc[2] == MIDI_OUT_JACK) 1419 else if (cs_desc[2] == MIDI_OUT_JACK)