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

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
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
snd-usb-audio-objs := card.o \ snd-usb-audio-objs := card.o \
usbmixer.o \ mixer.o \
mixer_quirks.o \ mixer_quirks.o \
proc.o \ proc.o \
quirks.o \ quirks.o \
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include "usbaudio.h" #include "usbaudio.h"
#include "card.h" #include "card.h"
#include "midi.h" #include "midi.h"
#include "usbmixer.h" #include "mixer.h"
#include "proc.h" #include "proc.h"
#include "quirks.h" #include "quirks.h"
#include "endpoint.h" #include "endpoint.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <sound/tlv.h> #include <sound/tlv.h>
#include "usbaudio.h" #include "usbaudio.h"
#include "usbmixer.h" #include "mixer.h"
#include "helper.h" #include "helper.h"
#include "mixer_quirks.h" #include "mixer_quirks.h"
...@@ -132,7 +132,7 @@ enum { ...@@ -132,7 +132,7 @@ enum {
* if the mixer topology is too complicated and the parsed names are * if the mixer topology is too complicated and the parsed names are
* ambiguous, add the entries in usbmixer_maps.c. * ambiguous, add the entries in usbmixer_maps.c.
*/ */
#include "usbmixer_maps.c" #include "mixer_maps.c"
static const struct usbmix_name_map * static const struct usbmix_name_map *
find_map(struct mixer_build *state, int unitid, int control) find_map(struct mixer_build *state, int unitid, int control)
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <sound/info.h> #include <sound/info.h>
#include "usbaudio.h" #include "usbaudio.h"
#include "usbmixer.h" #include "mixer.h"
#include "mixer_quirks.h" #include "mixer_quirks.h"
#include "helper.h" #include "helper.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "usbaudio.h" #include "usbaudio.h"
#include "card.h" #include "card.h"
#include "usbmixer.h" #include "mixer.h"
#include "mixer_quirks.h" #include "mixer_quirks.h"
#include "midi.h" #include "midi.h"
#include "quirks.h" #include "quirks.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment