From 8941c81372d2586dcc84a9497ffdbc8a6bab37a1 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Thu, 11 Mar 2010 21:13:23 +0100
Subject: [PATCH] --- yaml --- r: 193223 b: refs/heads/master c:
 f0b5e634ff25e02a64676022ee13284a9c810879 h: refs/heads/master i:   193221:
 2f72062f5a855d3a6622c8d1cce16f085165baab   193219:
 e9115e6681854358e93393a57e21d459c9645197   193215:
 2cf718a4d04abd7eb9546202c8db081e678205a4 v: v3

---
 [refs]                                            | 2 +-
 trunk/sound/usb/Makefile                          | 2 +-
 trunk/sound/usb/card.c                            | 2 +-
 trunk/sound/usb/{usbmixer.c => mixer.c}           | 4 ++--
 trunk/sound/usb/{usbmixer.h => mixer.h}           | 0
 trunk/sound/usb/{usbmixer_maps.c => mixer_maps.c} | 0
 trunk/sound/usb/mixer_quirks.c                    | 2 +-
 trunk/sound/usb/quirks.c                          | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename trunk/sound/usb/{usbmixer.c => mixer.c} (99%)
 rename trunk/sound/usb/{usbmixer.h => mixer.h} (100%)
 rename trunk/sound/usb/{usbmixer_maps.c => mixer_maps.c} (100%)

diff --git a/[refs] b/[refs]
index 6ee8726c3ee8..2268808816d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b1eda223debcba706ab989a09c4eecb327aebdf
+refs/heads/master: f0b5e634ff25e02a64676022ee13284a9c810879
diff --git a/trunk/sound/usb/Makefile b/trunk/sound/usb/Makefile
index 744024a0a9fc..e7ac7f493a8f 100644
--- a/trunk/sound/usb/Makefile
+++ b/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 \
diff --git a/trunk/sound/usb/card.c b/trunk/sound/usb/card.c
index 78d12ff00e8a..0bd62a1aa4f2 100644
--- a/trunk/sound/usb/card.c
+++ b/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"
diff --git a/trunk/sound/usb/usbmixer.c b/trunk/sound/usb/mixer.c
similarity index 99%
rename from trunk/sound/usb/usbmixer.c
rename to trunk/sound/usb/mixer.c
index ec2436e95321..4e7c2fd9e3b4 100644
--- a/trunk/sound/usb/usbmixer.c
+++ b/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)
diff --git a/trunk/sound/usb/usbmixer.h b/trunk/sound/usb/mixer.h
similarity index 100%
rename from trunk/sound/usb/usbmixer.h
rename to trunk/sound/usb/mixer.h
diff --git a/trunk/sound/usb/usbmixer_maps.c b/trunk/sound/usb/mixer_maps.c
similarity index 100%
rename from trunk/sound/usb/usbmixer_maps.c
rename to trunk/sound/usb/mixer_maps.c
diff --git a/trunk/sound/usb/mixer_quirks.c b/trunk/sound/usb/mixer_quirks.c
index d2f4dcdf59e3..56b665938b1b 100644
--- a/trunk/sound/usb/mixer_quirks.c
+++ b/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"
 
diff --git a/trunk/sound/usb/quirks.c b/trunk/sound/usb/quirks.c
index a82cfeda21f0..d4ced64e465b 100644
--- a/trunk/sound/usb/quirks.c
+++ b/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"