瀏覽代碼

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>
Takashi Iwai 10 年之前
父節點
當前提交
61864d844c

+ 0 - 2
drivers/staging/Kconfig

@@ -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"

+ 0 - 1
drivers/staging/Makefile

@@ -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/

+ 2 - 0
sound/usb/Kconfig

@@ -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
 

+ 1 - 0
sound/usb/Makefile

@@ -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/

+ 0 - 0
drivers/staging/line6/Kconfig → sound/usb/line6/Kconfig


+ 0 - 0
drivers/staging/line6/Makefile → sound/usb/line6/Makefile


+ 0 - 0
drivers/staging/line6/audio.c → sound/usb/line6/audio.c


+ 0 - 0
drivers/staging/line6/audio.h → sound/usb/line6/audio.h


+ 0 - 0
drivers/staging/line6/capture.c → sound/usb/line6/capture.c


+ 0 - 0
drivers/staging/line6/capture.h → sound/usb/line6/capture.h


+ 0 - 0
drivers/staging/line6/driver.c → sound/usb/line6/driver.c


+ 0 - 0
drivers/staging/line6/driver.h → sound/usb/line6/driver.h


+ 0 - 0
drivers/staging/line6/midi.c → sound/usb/line6/midi.c


+ 0 - 0
drivers/staging/line6/midi.h → sound/usb/line6/midi.h


+ 0 - 0
drivers/staging/line6/midibuf.c → sound/usb/line6/midibuf.c


+ 0 - 0
drivers/staging/line6/midibuf.h → sound/usb/line6/midibuf.h


+ 0 - 0
drivers/staging/line6/pcm.c → sound/usb/line6/pcm.c


+ 0 - 0
drivers/staging/line6/pcm.h → sound/usb/line6/pcm.h


+ 0 - 0
drivers/staging/line6/playback.c → sound/usb/line6/playback.c


+ 0 - 0
drivers/staging/line6/playback.h → sound/usb/line6/playback.h


+ 0 - 0
drivers/staging/line6/pod.c → sound/usb/line6/pod.c


+ 0 - 0
drivers/staging/line6/pod.h → sound/usb/line6/pod.h


+ 0 - 0
drivers/staging/line6/podhd.c → sound/usb/line6/podhd.c


+ 0 - 0
drivers/staging/line6/podhd.h → sound/usb/line6/podhd.h


+ 0 - 0
drivers/staging/line6/revision.h → sound/usb/line6/revision.h


+ 0 - 0
drivers/staging/line6/toneport.c → sound/usb/line6/toneport.c


+ 0 - 0
drivers/staging/line6/toneport.h → sound/usb/line6/toneport.h


+ 0 - 0
drivers/staging/line6/usbdefs.h → sound/usb/line6/usbdefs.h


+ 0 - 0
drivers/staging/line6/variax.c → sound/usb/line6/variax.c


+ 0 - 0
drivers/staging/line6/variax.h → sound/usb/line6/variax.h