aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2010-03-11 21:13:23 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-12 12:20:49 +0100
commitf0b5e634ff25e02a64676022ee13284a9c810879 (patch)
treeeeac4a37546af0b28eaa895c82c217d3289ebb50
parent7b1eda223debcba706ab989a09c4eecb327aebdf (diff)
downloadkernel_samsung_espresso10-f0b5e634ff25e02a64676022ee13284a9c810879.zip
kernel_samsung_espresso10-f0b5e634ff25e02a64676022ee13284a9c810879.tar.gz
kernel_samsung_espresso10-f0b5e634ff25e02a64676022ee13284a9c810879.tar.bz2
ALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch]
For clearer namespace, also rename usbmixer_maps.c -> mixer_maps.c Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/Makefile2
-rw-r--r--sound/usb/card.c2
-rw-r--r--sound/usb/mixer.c (renamed from sound/usb/usbmixer.c)4
-rw-r--r--sound/usb/mixer.h (renamed from sound/usb/usbmixer.h)0
-rw-r--r--sound/usb/mixer_maps.c (renamed from sound/usb/usbmixer_maps.c)0
-rw-r--r--sound/usb/mixer_quirks.c2
-rw-r--r--sound/usb/quirks.c2
7 files changed, 6 insertions, 6 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 744024a..e7ac7f4 100644
--- a/sound/usb/Makefile
+++ b/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/sound/usb/card.c b/sound/usb/card.c
index 78d12ff..0bd62a1 100644
--- a/sound/usb/card.c
+++ b/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/sound/usb/usbmixer.c b/sound/usb/mixer.c
index ec2436e..4e7c2fd 100644
--- a/sound/usb/usbmixer.c
+++ b/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/sound/usb/usbmixer.h b/sound/usb/mixer.h
index 63101ae..63101ae 100644
--- a/sound/usb/usbmixer.h
+++ b/sound/usb/mixer.h
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/mixer_maps.c
index d93fc89..d93fc89 100644
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/mixer_maps.c
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index d2f4dcd..56b6659 100644
--- a/sound/usb/mixer_quirks.c
+++ b/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/sound/usb/quirks.c b/sound/usb/quirks.c
index a82cfed..d4ced64 100644
--- a/sound/usb/quirks.c
+++ b/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"