diff options
| author | Daniel Mack <daniel@caiaq.de> | 2010-03-11 21:13:23 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-12 12:20:49 +0100 |
| commit | f0b5e634ff25e02a64676022ee13284a9c810879 (patch) | |
| tree | eeac4a37546af0b28eaa895c82c217d3289ebb50 | |
| parent | 7b1eda223debcba706ab989a09c4eecb327aebdf (diff) | |
| download | linux-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/Makefile | 2 | ||||
| -rw-r--r-- | sound/usb/card.c | 2 | ||||
| -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.c | 2 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile index 744024a0a9fc..e7ac7f493a8f 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 78d12ff00e8a..0bd62a1aa4f2 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 ec2436e95321..4e7c2fd9e3b4 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 63101ae201cc..63101ae201cc 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 d93fc89beba8..d93fc89beba8 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 d2f4dcdf59e3..56b665938b1b 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 a82cfeda21f0..d4ced64e465b 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" |