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

Commit 61864d84 authored Jan 12, 2015 by Takashi Iwai

ALSA: move line6 usb driver into sound/usb



Promote line6 driver from staging to sound/usb/line6 directory, and
maintain through sound subsystem tree.

This commit just moves the code and adapts Makefile / Kconfig.
The further renames and misc cleanups will follow.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent d29b854f

drivers/staging/Kconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@ source "drivers/staging/rtl8723au/Kconfig"

		source "drivers/staging/rts5208/Kconfig"

		source "drivers/staging/line6/Kconfig"

		source "drivers/staging/octeon/Kconfig"

		source "drivers/staging/octeon-usb/Kconfig"

drivers/staging/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ obj-$(CONFIG_R8712U) += rtl8712/
		obj-$(CONFIG_R8188EU) += rtl8188eu/
		obj-$(CONFIG_R8723AU) += rtl8723au/
		obj-$(CONFIG_RTS5208) += rts5208/
		obj-$(CONFIG_LINE6_USB) += line6/
		obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/
		obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
		obj-$(CONFIG_OCTEON_USB) += octeon-usb/

sound/usb/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -160,5 +160,7 @@ config SND_BCD2000
		To compile this driver as a module, choose M here: the module
		will be called snd-bcd2000.

		source "sound/usb/line6/Kconfig"

		endif # SND_USB

sound/usb/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,3 +25,4 @@ obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o
		obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o

		obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/
		obj-$(CONFIG_LINE6_USB) += line6/

drivers/staging/line6/Kconfig→sound/usb/line6/Kconfig

+0 −0

File moved.