Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc700ab1 authored Mar 04, 2010 by Daniel Mack Committed by Takashi Iwai Mar 05, 2010

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>

parent 282572b5

sound/usb/Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -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/

sound/usb/misc/Makefile

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		snd-ua101-objs := ua101.o
		obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o

sound/usb/ua101.c→sound/usb/misc/ua101.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>");