From 61864d844c296933d40c02683252bbea5193b101 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 12 Jan 2015 22:29:57 +0100 Subject: [PATCH] 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 --- drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - sound/usb/Kconfig | 2 ++ sound/usb/Makefile | 1 + {drivers/staging => sound/usb}/line6/Kconfig | 0 {drivers/staging => sound/usb}/line6/Makefile | 0 {drivers/staging => sound/usb}/line6/audio.c | 0 {drivers/staging => sound/usb}/line6/audio.h | 0 {drivers/staging => sound/usb}/line6/capture.c | 0 {drivers/staging => sound/usb}/line6/capture.h | 0 {drivers/staging => sound/usb}/line6/driver.c | 0 {drivers/staging => sound/usb}/line6/driver.h | 0 {drivers/staging => sound/usb}/line6/midi.c | 0 {drivers/staging => sound/usb}/line6/midi.h | 0 {drivers/staging => sound/usb}/line6/midibuf.c | 0 {drivers/staging => sound/usb}/line6/midibuf.h | 0 {drivers/staging => sound/usb}/line6/pcm.c | 0 {drivers/staging => sound/usb}/line6/pcm.h | 0 {drivers/staging => sound/usb}/line6/playback.c | 0 {drivers/staging => sound/usb}/line6/playback.h | 0 {drivers/staging => sound/usb}/line6/pod.c | 0 {drivers/staging => sound/usb}/line6/pod.h | 0 {drivers/staging => sound/usb}/line6/podhd.c | 0 {drivers/staging => sound/usb}/line6/podhd.h | 0 {drivers/staging => sound/usb}/line6/revision.h | 0 {drivers/staging => sound/usb}/line6/toneport.c | 0 {drivers/staging => sound/usb}/line6/toneport.h | 0 {drivers/staging => sound/usb}/line6/usbdefs.h | 0 {drivers/staging => sound/usb}/line6/variax.c | 0 {drivers/staging => sound/usb}/line6/variax.h | 0 30 files changed, 3 insertions(+), 3 deletions(-) rename {drivers/staging => sound/usb}/line6/Kconfig (100%) rename {drivers/staging => sound/usb}/line6/Makefile (100%) rename {drivers/staging => sound/usb}/line6/audio.c (100%) rename {drivers/staging => sound/usb}/line6/audio.h (100%) rename {drivers/staging => sound/usb}/line6/capture.c (100%) rename {drivers/staging => sound/usb}/line6/capture.h (100%) rename {drivers/staging => sound/usb}/line6/driver.c (100%) rename {drivers/staging => sound/usb}/line6/driver.h (100%) rename {drivers/staging => sound/usb}/line6/midi.c (100%) rename {drivers/staging => sound/usb}/line6/midi.h (100%) rename {drivers/staging => sound/usb}/line6/midibuf.c (100%) rename {drivers/staging => sound/usb}/line6/midibuf.h (100%) rename {drivers/staging => sound/usb}/line6/pcm.c (100%) rename {drivers/staging => sound/usb}/line6/pcm.h (100%) rename {drivers/staging => sound/usb}/line6/playback.c (100%) rename {drivers/staging => sound/usb}/line6/playback.h (100%) rename {drivers/staging => sound/usb}/line6/pod.c (100%) rename {drivers/staging => sound/usb}/line6/pod.h (100%) rename {drivers/staging => sound/usb}/line6/podhd.c (100%) rename {drivers/staging => sound/usb}/line6/podhd.h (100%) rename {drivers/staging => sound/usb}/line6/revision.h (100%) rename {drivers/staging => sound/usb}/line6/toneport.c (100%) rename {drivers/staging => sound/usb}/line6/toneport.h (100%) rename {drivers/staging => sound/usb}/line6/usbdefs.h (100%) rename {drivers/staging => sound/usb}/line6/variax.c (100%) rename {drivers/staging => sound/usb}/line6/variax.h (100%) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 815de379a130..9049dd91b569 100644 --- 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 33c640b49566..fe26ff162b42 100644 --- 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 index d393153c474f..a452ad7cec40 100644 --- 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 index bcee4060fd18..54045b745d11 100644 --- 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 b/sound/usb/line6/Kconfig similarity index 100% rename from drivers/staging/line6/Kconfig rename to sound/usb/line6/Kconfig diff --git a/drivers/staging/line6/Makefile b/sound/usb/line6/Makefile similarity index 100% rename from drivers/staging/line6/Makefile rename to sound/usb/line6/Makefile diff --git a/drivers/staging/line6/audio.c b/sound/usb/line6/audio.c similarity index 100% rename from drivers/staging/line6/audio.c rename to sound/usb/line6/audio.c diff --git a/drivers/staging/line6/audio.h b/sound/usb/line6/audio.h similarity index 100% rename from drivers/staging/line6/audio.h rename to sound/usb/line6/audio.h diff --git a/drivers/staging/line6/capture.c b/sound/usb/line6/capture.c similarity index 100% rename from drivers/staging/line6/capture.c rename to sound/usb/line6/capture.c diff --git a/drivers/staging/line6/capture.h b/sound/usb/line6/capture.h similarity index 100% rename from drivers/staging/line6/capture.h rename to sound/usb/line6/capture.h diff --git a/drivers/staging/line6/driver.c b/sound/usb/line6/driver.c similarity index 100% rename from drivers/staging/line6/driver.c rename to sound/usb/line6/driver.c diff --git a/drivers/staging/line6/driver.h b/sound/usb/line6/driver.h similarity index 100% rename from drivers/staging/line6/driver.h rename to sound/usb/line6/driver.h diff --git a/drivers/staging/line6/midi.c b/sound/usb/line6/midi.c similarity index 100% rename from drivers/staging/line6/midi.c rename to sound/usb/line6/midi.c diff --git a/drivers/staging/line6/midi.h b/sound/usb/line6/midi.h similarity index 100% rename from drivers/staging/line6/midi.h rename to sound/usb/line6/midi.h diff --git a/drivers/staging/line6/midibuf.c b/sound/usb/line6/midibuf.c similarity index 100% rename from drivers/staging/line6/midibuf.c rename to sound/usb/line6/midibuf.c diff --git a/drivers/staging/line6/midibuf.h b/sound/usb/line6/midibuf.h similarity index 100% rename from drivers/staging/line6/midibuf.h rename to sound/usb/line6/midibuf.h diff --git a/drivers/staging/line6/pcm.c b/sound/usb/line6/pcm.c similarity index 100% rename from drivers/staging/line6/pcm.c rename to sound/usb/line6/pcm.c diff --git a/drivers/staging/line6/pcm.h b/sound/usb/line6/pcm.h similarity index 100% rename from drivers/staging/line6/pcm.h rename to sound/usb/line6/pcm.h diff --git a/drivers/staging/line6/playback.c b/sound/usb/line6/playback.c similarity index 100% rename from drivers/staging/line6/playback.c rename to sound/usb/line6/playback.c diff --git a/drivers/staging/line6/playback.h b/sound/usb/line6/playback.h similarity index 100% rename from drivers/staging/line6/playback.h rename to sound/usb/line6/playback.h diff --git a/drivers/staging/line6/pod.c b/sound/usb/line6/pod.c similarity index 100% rename from drivers/staging/line6/pod.c rename to sound/usb/line6/pod.c diff --git a/drivers/staging/line6/pod.h b/sound/usb/line6/pod.h similarity index 100% rename from drivers/staging/line6/pod.h rename to sound/usb/line6/pod.h diff --git a/drivers/staging/line6/podhd.c b/sound/usb/line6/podhd.c similarity index 100% rename from drivers/staging/line6/podhd.c rename to sound/usb/line6/podhd.c diff --git a/drivers/staging/line6/podhd.h b/sound/usb/line6/podhd.h similarity index 100% rename from drivers/staging/line6/podhd.h rename to sound/usb/line6/podhd.h diff --git a/drivers/staging/line6/revision.h b/sound/usb/line6/revision.h similarity index 100% rename from drivers/staging/line6/revision.h rename to sound/usb/line6/revision.h diff --git a/drivers/staging/line6/toneport.c b/sound/usb/line6/toneport.c similarity index 100% rename from drivers/staging/line6/toneport.c rename to sound/usb/line6/toneport.c diff --git a/drivers/staging/line6/toneport.h b/sound/usb/line6/toneport.h similarity index 100% rename from drivers/staging/line6/toneport.h rename to sound/usb/line6/toneport.h diff --git a/drivers/staging/line6/usbdefs.h b/sound/usb/line6/usbdefs.h similarity index 100% rename from drivers/staging/line6/usbdefs.h rename to sound/usb/line6/usbdefs.h diff --git a/drivers/staging/line6/variax.c b/sound/usb/line6/variax.c similarity index 100% rename from drivers/staging/line6/variax.c rename to sound/usb/line6/variax.c diff --git a/drivers/staging/line6/variax.h b/sound/usb/line6/variax.h similarity index 100% rename from drivers/staging/line6/variax.h rename to sound/usb/line6/variax.h