diff options
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | sound/usb/Kconfig | 2 | ||||
| -rw-r--r-- | sound/usb/Makefile | 1 | ||||
| -rw-r--r-- | sound/usb/line6/Kconfig (renamed from drivers/staging/line6/Kconfig) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/Makefile (renamed from drivers/staging/line6/Makefile) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/audio.c (renamed from drivers/staging/line6/audio.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/audio.h (renamed from drivers/staging/line6/audio.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/capture.c (renamed from drivers/staging/line6/capture.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/capture.h (renamed from drivers/staging/line6/capture.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/driver.c (renamed from drivers/staging/line6/driver.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/driver.h (renamed from drivers/staging/line6/driver.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/midi.c (renamed from drivers/staging/line6/midi.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/midi.h (renamed from drivers/staging/line6/midi.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/midibuf.c (renamed from drivers/staging/line6/midibuf.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/midibuf.h (renamed from drivers/staging/line6/midibuf.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/pcm.c (renamed from drivers/staging/line6/pcm.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/pcm.h (renamed from drivers/staging/line6/pcm.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/playback.c (renamed from drivers/staging/line6/playback.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/playback.h (renamed from drivers/staging/line6/playback.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/pod.c (renamed from drivers/staging/line6/pod.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/pod.h (renamed from drivers/staging/line6/pod.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/podhd.c (renamed from drivers/staging/line6/podhd.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/podhd.h (renamed from drivers/staging/line6/podhd.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/revision.h (renamed from drivers/staging/line6/revision.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/toneport.c (renamed from drivers/staging/line6/toneport.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/toneport.h (renamed from drivers/staging/line6/toneport.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/usbdefs.h (renamed from drivers/staging/line6/usbdefs.h) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/variax.c (renamed from drivers/staging/line6/variax.c) | 0 | ||||
| -rw-r--r-- | sound/usb/line6/variax.h (renamed from drivers/staging/line6/variax.h) | 0 |
30 files changed, 3 insertions, 3 deletions
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 index 4f1219b4c692..4f1219b4c692 100644 --- a/drivers/staging/line6/Kconfig +++ b/sound/usb/line6/Kconfig diff --git a/drivers/staging/line6/Makefile b/sound/usb/line6/Makefile index ae5c374b0f87..ae5c374b0f87 100644 --- a/drivers/staging/line6/Makefile +++ b/sound/usb/line6/Makefile diff --git a/drivers/staging/line6/audio.c b/sound/usb/line6/audio.c index 171d80c1b020..171d80c1b020 100644 --- a/drivers/staging/line6/audio.c +++ b/sound/usb/line6/audio.c diff --git a/drivers/staging/line6/audio.h b/sound/usb/line6/audio.h index 5f8a09a0fa95..5f8a09a0fa95 100644 --- a/drivers/staging/line6/audio.h +++ b/sound/usb/line6/audio.h diff --git a/drivers/staging/line6/capture.c b/sound/usb/line6/capture.c index f24c7c5e0a3e..f24c7c5e0a3e 100644 --- a/drivers/staging/line6/capture.c +++ b/sound/usb/line6/capture.c diff --git a/drivers/staging/line6/capture.h b/sound/usb/line6/capture.h index 4157bcb598a9..4157bcb598a9 100644 --- a/drivers/staging/line6/capture.h +++ b/sound/usb/line6/capture.h diff --git a/drivers/staging/line6/driver.c b/sound/usb/line6/driver.c index fc852f6ab8bc..fc852f6ab8bc 100644 --- a/drivers/staging/line6/driver.c +++ b/sound/usb/line6/driver.c diff --git a/drivers/staging/line6/driver.h b/sound/usb/line6/driver.h index ad203f197e80..ad203f197e80 100644 --- a/drivers/staging/line6/driver.h +++ b/sound/usb/line6/driver.h diff --git a/drivers/staging/line6/midi.c b/sound/usb/line6/midi.c index c9d725ae85a0..c9d725ae85a0 100644 --- a/drivers/staging/line6/midi.c +++ b/sound/usb/line6/midi.c diff --git a/drivers/staging/line6/midi.h b/sound/usb/line6/midi.h index 78f903fb4d41..78f903fb4d41 100644 --- a/drivers/staging/line6/midi.h +++ b/sound/usb/line6/midi.h diff --git a/drivers/staging/line6/midibuf.c b/sound/usb/line6/midibuf.c index 1ff856989fd6..1ff856989fd6 100644 --- a/drivers/staging/line6/midibuf.c +++ b/sound/usb/line6/midibuf.c diff --git a/drivers/staging/line6/midibuf.h b/sound/usb/line6/midibuf.h index 707482b940e4..707482b940e4 100644 --- a/drivers/staging/line6/midibuf.h +++ b/sound/usb/line6/midibuf.h diff --git a/drivers/staging/line6/pcm.c b/sound/usb/line6/pcm.c index 6d4e5cd0482c..6d4e5cd0482c 100644 --- a/drivers/staging/line6/pcm.c +++ b/sound/usb/line6/pcm.c diff --git a/drivers/staging/line6/pcm.h b/sound/usb/line6/pcm.h index 7315e8131184..7315e8131184 100644 --- a/drivers/staging/line6/pcm.h +++ b/sound/usb/line6/pcm.h diff --git a/drivers/staging/line6/playback.c b/sound/usb/line6/playback.c index da2e3b8876b8..da2e3b8876b8 100644 --- a/drivers/staging/line6/playback.c +++ b/sound/usb/line6/playback.c diff --git a/drivers/staging/line6/playback.h b/sound/usb/line6/playback.h index 743bd6f74c57..743bd6f74c57 100644 --- a/drivers/staging/line6/playback.h +++ b/sound/usb/line6/playback.h diff --git a/drivers/staging/line6/pod.c b/sound/usb/line6/pod.c index 85a43631996e..85a43631996e 100644 --- a/drivers/staging/line6/pod.c +++ b/sound/usb/line6/pod.c diff --git a/drivers/staging/line6/pod.h b/sound/usb/line6/pod.h index 87a8f0fa9cba..87a8f0fa9cba 100644 --- a/drivers/staging/line6/pod.h +++ b/sound/usb/line6/pod.h diff --git a/drivers/staging/line6/podhd.c b/sound/usb/line6/podhd.c index 27c5402cece8..27c5402cece8 100644 --- a/drivers/staging/line6/podhd.c +++ b/sound/usb/line6/podhd.c diff --git a/drivers/staging/line6/podhd.h b/sound/usb/line6/podhd.h index a14f711f9725..a14f711f9725 100644 --- a/drivers/staging/line6/podhd.h +++ b/sound/usb/line6/podhd.h diff --git a/drivers/staging/line6/revision.h b/sound/usb/line6/revision.h index b4eee2b73831..b4eee2b73831 100644 --- a/drivers/staging/line6/revision.h +++ b/sound/usb/line6/revision.h diff --git a/drivers/staging/line6/toneport.c b/sound/usb/line6/toneport.c index aae78d8a82d9..aae78d8a82d9 100644 --- a/drivers/staging/line6/toneport.c +++ b/sound/usb/line6/toneport.c diff --git a/drivers/staging/line6/toneport.h b/sound/usb/line6/toneport.h index 8cb14426f6ae..8cb14426f6ae 100644 --- a/drivers/staging/line6/toneport.h +++ b/sound/usb/line6/toneport.h diff --git a/drivers/staging/line6/usbdefs.h b/sound/usb/line6/usbdefs.h index f4d080e69abc..f4d080e69abc 100644 --- a/drivers/staging/line6/usbdefs.h +++ b/sound/usb/line6/usbdefs.h diff --git a/drivers/staging/line6/variax.c b/sound/usb/line6/variax.c index b4a41b0ad0ea..b4a41b0ad0ea 100644 --- a/drivers/staging/line6/variax.c +++ b/sound/usb/line6/variax.c diff --git a/drivers/staging/line6/variax.h b/sound/usb/line6/variax.h index dfb94e574cc4..dfb94e574cc4 100644 --- a/drivers/staging/line6/variax.h +++ b/sound/usb/line6/variax.h |