diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-08-03 09:10:08 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-08-03 09:10:08 +0300 |
| commit | 3b5d1afd1f13bcab85eaa28223ad396694f929e3 (patch) | |
| tree | 02983e414b3d918114c15b8410ab46c245a07a29 /sound/usb/mixer_maps.c | |
| parent | f1ec5be17b9aafbc5f573da023850566b43d8e5e (diff) | |
| parent | 2ac82e20e2377fb0b63ce40bba56558f2df7cd3e (diff) | |
| download | linux-3b5d1afd1f13bcab85eaa28223ad396694f929e3.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/usb/mixer_maps.c')
| -rw-r--r-- | sound/usb/mixer_maps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 9af7aa93f6fa..2ec484655201 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -233,7 +233,7 @@ static const struct usbmix_name_map maya44_map[] = { }; /* Section "justlink_map" below added by James Courtier-Dutton <James@superbug.demon.co.uk> - * sourced from Maplin Electronics (http://www.maplin.co.uk), part number A56AK + * sourced from Maplin Electronics (https://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.) * The USB Mixer publishes a Microphone and extra Volume controls for it, but none exist on the device, * so this map removes all unwanted sliders from alsamixer |