mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
d29b854fe9
commit
61864d844c
|
@ -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"
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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/
|
||||
|
|
Loading…
Reference in New Issue