aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/endpoint.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-25 09:56:32 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-25 09:56:32 +0200
commit79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (patch)
treee32a4c267dc1b5950012e18c1e71d8057140f1f5 /sound/usb/endpoint.c
parentLinux 2.6.36 (diff)
parentALSA: usb - Creative USB X-Fi volume knob support (diff)
downloadlinux-dev-79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703.tar.xz
linux-dev-79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703.zip
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/endpoint.c')
-rw-r--r--sound/usb/endpoint.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index ef0a07e34844..b0ef9f501896 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -405,8 +405,6 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
break;
case USB_ID(0x041e, 0x3020): /* Creative SB Audigy 2 NX */
case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */
- case USB_ID(0x0763, 0x2080): /* M-Audio Fast Track Ultra 8 */
- case USB_ID(0x0763, 0x2081): /* M-Audio Fast Track Ultra 8R */
/* doesn't set the sample rate attribute, but supports it */
fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE;
break;