Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

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;