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>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 815de37..9049dd9 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/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"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 33c640b..fe26ff1 100644 (file)
--- a/drivers/staging/Makefile
+++ b/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/

diff --cc sound/usb/Kconfig
Simple merge

diff --cc sound/usb/Makefile
Simple merge

diff --cc sound/usb/line6/Kconfig
Simple merge

diff --cc sound/usb/line6/Makefile
Simple merge

diff --cc sound/usb/line6/audio.c
Simple merge

diff --cc sound/usb/line6/audio.h
Simple merge

diff --cc sound/usb/line6/capture.c
Simple merge

diff --cc sound/usb/line6/capture.h
Simple merge

diff --cc sound/usb/line6/driver.c
Simple merge

diff --cc sound/usb/line6/driver.h
Simple merge

diff --cc sound/usb/line6/midi.c
Simple merge

diff --cc sound/usb/line6/midi.h
Simple merge

diff --cc sound/usb/line6/midibuf.c
Simple merge

diff --cc sound/usb/line6/midibuf.h
Simple merge

diff --cc sound/usb/line6/pcm.c
Simple merge

diff --cc sound/usb/line6/pcm.h
Simple merge

diff --cc sound/usb/line6/playback.c
Simple merge

diff --cc sound/usb/line6/playback.h
Simple merge

diff --cc sound/usb/line6/pod.c
Simple merge

diff --cc sound/usb/line6/pod.h
Simple merge

diff --cc sound/usb/line6/podhd.c
Simple merge

diff --cc sound/usb/line6/podhd.h
Simple merge

diff --cc sound/usb/line6/revision.h
Simple merge

diff --cc sound/usb/line6/toneport.c
Simple merge

diff --cc sound/usb/line6/toneport.h
Simple merge

diff --cc sound/usb/line6/usbdefs.h
Simple merge

diff --cc sound/usb/line6/variax.c
Simple merge

diff --cc sound/usb/line6/variax.h
Simple merge