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 Cc: Takashi Iwai tiwai@suse.de --- sound/usb/Makefile | 5 ++--- sound/usb/ua101/Makefile | 2 ++ sound/usb/{ => ua101}/ua101.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 sound/usb/ua101/Makefile rename sound/usb/{ => ua101}/ua101.c (99%)
diff --git a/sound/usb/Makefile b/sound/usb/Makefile index 5bf64ae..8bc005b 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) += ua101/ usx2y/ caiaq/ diff --git a/sound/usb/ua101/Makefile b/sound/usb/ua101/Makefile new file mode 100644 index 0000000..ccefd81 --- /dev/null +++ b/sound/usb/ua101/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/ua101/ua101.c similarity index 99% rename from sound/usb/ua101.c rename to sound/usb/ua101/ua101.c index 4f4ccdf..c7dcfe2 100644 --- a/sound/usb/ua101.c +++ b/sound/usb/ua101/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 driver"); MODULE_AUTHOR("Clemens Ladisch clemens@ladisch.de");