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>
mariux64 · Jan 12, 2015 · 61864d8 · 61864d8
1 parent d29b854
commit 61864d8
Show file tree

Hide file tree

Showing 30 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 --git a/sound/usb/Kconfig b/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
 
diff --git a/sound/usb/Makefile b/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/
diff --git a/drivers/staging/line6/Kconfig → sound/usb/line6/Kconfig b/drivers/staging/line6/Kconfig → sound/usb/line6/Kconfig
diff --git a/drivers/staging/line6/Makefile → sound/usb/line6/Makefile b/drivers/staging/line6/Makefile → sound/usb/line6/Makefile
diff --git a/drivers/staging/line6/audio.c → sound/usb/line6/audio.c b/drivers/staging/line6/audio.c → sound/usb/line6/audio.c
diff --git a/drivers/staging/line6/audio.h → sound/usb/line6/audio.h b/drivers/staging/line6/audio.h → sound/usb/line6/audio.h
diff --git a/drivers/staging/line6/capture.c → sound/usb/line6/capture.c b/drivers/staging/line6/capture.c → sound/usb/line6/capture.c
diff --git a/drivers/staging/line6/capture.h → sound/usb/line6/capture.h b/drivers/staging/line6/capture.h → sound/usb/line6/capture.h
diff --git a/drivers/staging/line6/driver.c → sound/usb/line6/driver.c b/drivers/staging/line6/driver.c → sound/usb/line6/driver.c
diff --git a/drivers/staging/line6/driver.h → sound/usb/line6/driver.h b/drivers/staging/line6/driver.h → sound/usb/line6/driver.h
diff --git a/drivers/staging/line6/midi.c → sound/usb/line6/midi.c b/drivers/staging/line6/midi.c → sound/usb/line6/midi.c
diff --git a/drivers/staging/line6/midi.h → sound/usb/line6/midi.h b/drivers/staging/line6/midi.h → sound/usb/line6/midi.h
diff --git a/drivers/staging/line6/midibuf.c → sound/usb/line6/midibuf.c b/drivers/staging/line6/midibuf.c → sound/usb/line6/midibuf.c
diff --git a/drivers/staging/line6/midibuf.h → sound/usb/line6/midibuf.h b/drivers/staging/line6/midibuf.h → sound/usb/line6/midibuf.h
diff --git a/drivers/staging/line6/pcm.c → sound/usb/line6/pcm.c b/drivers/staging/line6/pcm.c → sound/usb/line6/pcm.c
diff --git a/drivers/staging/line6/pcm.h → sound/usb/line6/pcm.h b/drivers/staging/line6/pcm.h → sound/usb/line6/pcm.h
diff --git a/drivers/staging/line6/playback.c → sound/usb/line6/playback.c b/drivers/staging/line6/playback.c → sound/usb/line6/playback.c
diff --git a/drivers/staging/line6/playback.h → sound/usb/line6/playback.h b/drivers/staging/line6/playback.h → sound/usb/line6/playback.h
diff --git a/drivers/staging/line6/pod.c → sound/usb/line6/pod.c b/drivers/staging/line6/pod.c → sound/usb/line6/pod.c
diff --git a/drivers/staging/line6/pod.h → sound/usb/line6/pod.h b/drivers/staging/line6/pod.h → sound/usb/line6/pod.h
diff --git a/drivers/staging/line6/podhd.c → sound/usb/line6/podhd.c b/drivers/staging/line6/podhd.c → sound/usb/line6/podhd.c
diff --git a/drivers/staging/line6/podhd.h → sound/usb/line6/podhd.h b/drivers/staging/line6/podhd.h → sound/usb/line6/podhd.h
diff --git a/drivers/staging/line6/revision.h → sound/usb/line6/revision.h b/drivers/staging/line6/revision.h → sound/usb/line6/revision.h
diff --git a/drivers/staging/line6/toneport.c → sound/usb/line6/toneport.c b/drivers/staging/line6/toneport.c → sound/usb/line6/toneport.c
diff --git a/drivers/staging/line6/toneport.h → sound/usb/line6/toneport.h b/drivers/staging/line6/toneport.h → sound/usb/line6/toneport.h
diff --git a/drivers/staging/line6/usbdefs.h → sound/usb/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h → sound/usb/line6/usbdefs.h
diff --git a/drivers/staging/line6/variax.c → sound/usb/line6/variax.c b/drivers/staging/line6/variax.c → sound/usb/line6/variax.c
diff --git a/drivers/staging/line6/variax.h → sound/usb/line6/variax.h b/drivers/staging/line6/variax.h → sound/usb/line6/variax.h