X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fusb%2Fusbmixer_maps.c;fp=sound%2Fusb%2Fusbmixer_maps.c;h=c1264434e50ac0f2134d8f56f4235c999c7898ba;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=37accb68652d0732aacff50dd15a4a7b36663ee3;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c index 37accb686..c1264434e 100644 --- a/sound/usb/usbmixer_maps.c +++ b/sound/usb/usbmixer_maps.c @@ -195,22 +195,6 @@ static struct usbmix_name_map linex_map[] = { { 0 } /* terminator */ }; -static struct usbmix_name_map maya44_map[] = { - /* 1: IT line */ - { 2, "Line Playback" }, /* FU */ - /* 3: IT line */ - { 4, "Line Playback" }, /* FU */ - /* 5: IT pcm playback */ - /* 6: MU */ - { 7, "Master Playback" }, /* FU */ - /* 8: OT speaker */ - /* 9: IT line */ - { 10, "Line Capture" }, /* FU */ - /* 11: MU */ - /* 12: OT pcm capture */ - { } -}; - /* Section "justlink_map" below added by James Courtier-Dutton * sourced from Maplin Electronics (http://www.maplin.co.uk), part number A56AK * Part has 2 connectors that act as a single output. (TOSLINK Optical for digital out, and 3.5mm Jack for Analogue out.) @@ -268,10 +252,6 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .map = linex_map, .ignore_ctl_error = 1, }, - { - .id = USB_ID(0x0a92, 0x0091), - .map = maya44_map, - }, { .id = USB_ID(0x0c45, 0x1158), .map = justlink_map,