Skip to content

Commit

Permalink
ALSA: usb-audio: move ua101 driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Mack authored and Takashi Iwai committed Mar 5, 2010
1 parent 282572b commit bc700ab
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 2 additions & 3 deletions sound/usb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 2 additions & 0 deletions sound/usb/misc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
snd-ua101-objs := ua101.o
obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o
2 changes: 1 addition & 1 deletion sound/usb/ua101.c → sound/usb/misc/ua101.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>");
Expand Down

0 comments on commit bc700ab

Please sign in to comment.