diff options
| author | Daniel Mack <daniel@caiaq.de> | 2010-03-04 19:46:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-05 08:15:36 +0100 |
| commit | bc700ab1407864ebee838de53c9565a394f4da38 (patch) | |
| tree | a52f0103f4554c8d9f57aeee087204ce80e2f7f9 | |
| parent | ALSA: riptide: clean up while loop (diff) | |
| download | linux-bc700ab1407864ebee838de53c9565a394f4da38.tar.xz linux-bc700ab1407864ebee838de53c9565a394f4da38.zip | |
ALSA: usb-audio: move ua101 driver
As part of the USB audio code cleanup, move the non-standard ua101
driver out of the way.
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 | 5 | ||||
| -rw-r--r-- | sound/usb/misc/Makefile | 2 | ||||
| -rw-r--r-- | sound/usb/misc/ua101.c (renamed from sound/usb/ua101.c) | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile index 5bf64aef9558..b0e55973c68e 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -4,12 +4,11 @@ snd-usb-audio-objs := usbaudio.o usbmixer.o snd-usb-lib-objs := usbmidi.o -snd-ua101-objs := ua101.o # Toplevel Module Dependency obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o -obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o snd-usb-lib.o +obj-$(CONFIG_SND_USB_UA101) += snd-usb-lib.o obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o -obj-$(CONFIG_SND) += usx2y/ caiaq/ +obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ diff --git a/sound/usb/misc/Makefile b/sound/usb/misc/Makefile new file mode 100644 index 000000000000..ccefd8158936 --- /dev/null +++ b/sound/usb/misc/Makefile @@ -0,0 +1,2 @@ +snd-ua101-objs := ua101.o +obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o diff --git a/sound/usb/ua101.c b/sound/usb/misc/ua101.c index 3d458d3b9962..e9b0ae52ca82 100644 --- a/sound/usb/ua101.c +++ b/sound/usb/misc/ua101.c @@ -23,7 +23,7 @@ #include <sound/initval.h> #include <sound/pcm.h> #include <sound/pcm_params.h> -#include "usbaudio.h" +#include "../usbaudio.h" MODULE_DESCRIPTION("Edirol UA-101/1000 driver"); MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>"); |