Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b5e634 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch] 



For clearer namespace, also rename usbmixer_maps.c -> mixer_maps.c

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7b1eda22

sound/usb/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



snd-usb-audio-objs := 	card.o \

			usbmixer.o \

			mixer.o \

			mixer_quirks.o \

			proc.o \

			quirks.o \

sound/usb/card.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include "usbaudio.h"

#include "card.h"

#include "midi.h"

#include "usbmixer.h"

#include "mixer.h"

#include "proc.h"

#include "quirks.h"

#include "endpoint.h"

sound/usb/usbmixer.c→sound/usb/mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <sound/tlv.h>



#include "usbaudio.h"

#include "usbmixer.h"

#include "mixer.h"

#include "helper.h"

#include "mixer_quirks.h"
@@ -132,7 +132,7 @@ enum { 
 * if the mixer topology is too complicated and the parsed names are

 * ambiguous, add the entries in usbmixer_maps.c.

 */

#include "usbmixer_maps.c"

#include "mixer_maps.c"



static const struct usbmix_name_map *

find_map(struct mixer_build *state, int unitid, int control)

sound/usb/usbmixer.h→sound/usb/mixer.h

+0 −0

File moved.

View file

sound/usb/usbmixer_maps.c→sound/usb/mixer_maps.c

+0 −0

File moved.

View file