---

yaml
---
r: 193223
b: refs/heads/master
c: f0b5e63
h: refs/heads/master
i:
  193221: 2f72062
  193219: e9115e6
  193215: 2cf718a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b1eda223debcba706ab989a09c4eecb327aebdf
+refs/heads/master: f0b5e634ff25e02a64676022ee13284a9c810879

trunk/sound/usb/Makefile

@@ -3,7 +3,7 @@
 #
 
 snd-usb-audio-objs := 	card.o \
-			usbmixer.o \
+			mixer.o \
 			mixer_quirks.o \
 			proc.o \
 			quirks.o \

trunk/sound/usb/card.c

@@ -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"

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

@@ -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)

trunk/sound/usb/mixer_quirks.c

@@ -35,7 +35,7 @@
 #include <sound/info.h>
 
 #include "usbaudio.h"
-#include "usbmixer.h"
+#include "mixer.h"
 #include "mixer_quirks.h"
 #include "helper.h"
 

trunk/sound/usb/quirks.c

@@ -24,7 +24,7 @@
 
 #include "usbaudio.h"
 #include "card.h"
-#include "usbmixer.h"
+#include "mixer.h"
 #include "mixer_quirks.h"
 #include "midi.h"
 #include "quirks.h"