Merge ../scsi-misc-2.6

[mv-sheeva.git] / sound / usb / usbquirks.h

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index f231de5a586f4410a88044a073ff8c67c75bad37..9351846d7a9d97997c2f51c770d498252e5e4071 100644 (file)
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -1409,6 +1409,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 
 /* Casio devices */
+{
+       USB_DEVICE(0x07cf, 0x6801),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Casio",
+               .product_name = "PL-40R",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_YAMAHA
+       }
+},
 {
        /* this ID is used by several devices without a product ID */
        USB_DEVICE(0x07cf, 0x6802),
@@ -1521,6 +1530,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                .type = QUIRK_MIDI_STANDARD_INTERFACE
        }
 },
+{
+       USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0014),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "TerraTec",
+               .product_name = "PHASE 26",
+               .ifnum = 3,
+               .type = QUIRK_MIDI_STANDARD_INTERFACE
+       }
+},
 {
        USB_DEVICE(0x0ccd, 0x0035),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {