oracle
diff --git a/‎drivers/staging/Kconfig
Lines changed: 0 additions & 2 deletions b/‎drivers/staging/Kconfig
Lines changed: 0 additions & 2 deletions
diff --git a/‎drivers/staging/Makefile
Lines changed: 0 additions & 1 deletion b/‎drivers/staging/Makefile
Lines changed: 0 additions & 1 deletion
diff --git a/‎sound/usb/Kconfig
Lines changed: 2 additions & 0 deletions b/‎sound/usb/Kconfig
Lines changed: 2 additions & 0 deletions
diff --git a/‎sound/usb/Makefile
Lines changed: 1 addition & 0 deletions b/‎sound/usb/Makefile
Lines changed: 1 addition & 0 deletions
diff --git a/‎drivers/staging/line6/Kconfig renamed to ‎sound/usb/line6/Kconfig b/‎drivers/staging/line6/Kconfig renamed to ‎sound/usb/line6/Kconfig
diff --git a/‎drivers/staging/line6/Makefile renamed to ‎sound/usb/line6/Makefile b/‎drivers/staging/line6/Makefile renamed to ‎sound/usb/line6/Makefile
diff --git a/‎drivers/staging/line6/audio.c renamed to ‎sound/usb/line6/audio.c b/‎drivers/staging/line6/audio.c renamed to ‎sound/usb/line6/audio.c
diff --git a/‎drivers/staging/line6/audio.h renamed to ‎sound/usb/line6/audio.h b/‎drivers/staging/line6/audio.h renamed to ‎sound/usb/line6/audio.h
diff --git a/‎drivers/staging/line6/capture.c renamed to ‎sound/usb/line6/capture.c b/‎drivers/staging/line6/capture.c renamed to ‎sound/usb/line6/capture.c
diff --git a/‎drivers/staging/line6/capture.h renamed to ‎sound/usb/line6/capture.h b/‎drivers/staging/line6/capture.h renamed to ‎sound/usb/line6/capture.h
diff --git a/‎drivers/staging/line6/driver.c renamed to ‎sound/usb/line6/driver.c b/‎drivers/staging/line6/driver.c renamed to ‎sound/usb/line6/driver.c
diff --git a/‎drivers/staging/line6/driver.h renamed to ‎sound/usb/line6/driver.h b/‎drivers/staging/line6/driver.h renamed to ‎sound/usb/line6/driver.h
diff --git a/‎drivers/staging/line6/midi.c renamed to ‎sound/usb/line6/midi.c b/‎drivers/staging/line6/midi.c renamed to ‎sound/usb/line6/midi.c
diff --git a/‎drivers/staging/line6/midi.h renamed to ‎sound/usb/line6/midi.h b/‎drivers/staging/line6/midi.h renamed to ‎sound/usb/line6/midi.h
diff --git a/‎drivers/staging/line6/midibuf.c renamed to ‎sound/usb/line6/midibuf.c b/‎drivers/staging/line6/midibuf.c renamed to ‎sound/usb/line6/midibuf.c
diff --git a/‎drivers/staging/line6/midibuf.h renamed to ‎sound/usb/line6/midibuf.h b/‎drivers/staging/line6/midibuf.h renamed to ‎sound/usb/line6/midibuf.h
diff --git a/‎drivers/staging/line6/pcm.c renamed to ‎sound/usb/line6/pcm.c b/‎drivers/staging/line6/pcm.c renamed to ‎sound/usb/line6/pcm.c
diff --git a/‎drivers/staging/line6/pcm.h renamed to ‎sound/usb/line6/pcm.h b/‎drivers/staging/line6/pcm.h renamed to ‎sound/usb/line6/pcm.h
diff --git a/‎drivers/staging/line6/playback.c renamed to ‎sound/usb/line6/playback.c b/‎drivers/staging/line6/playback.c renamed to ‎sound/usb/line6/playback.c
diff --git a/‎drivers/staging/line6/playback.h renamed to ‎sound/usb/line6/playback.h b/‎drivers/staging/line6/playback.h renamed to ‎sound/usb/line6/playback.h
diff --git a/‎drivers/staging/line6/pod.c renamed to ‎sound/usb/line6/pod.c b/‎drivers/staging/line6/pod.c renamed to ‎sound/usb/line6/pod.c
diff --git a/‎drivers/staging/line6/pod.h renamed to ‎sound/usb/line6/pod.h b/‎drivers/staging/line6/pod.h renamed to ‎sound/usb/line6/pod.h
diff --git a/‎drivers/staging/line6/podhd.c renamed to ‎sound/usb/line6/podhd.c b/‎drivers/staging/line6/podhd.c renamed to ‎sound/usb/line6/podhd.c
diff --git a/‎drivers/staging/line6/podhd.h renamed to ‎sound/usb/line6/podhd.h b/‎drivers/staging/line6/podhd.h renamed to ‎sound/usb/line6/podhd.h
diff --git a/‎drivers/staging/line6/revision.h renamed to ‎sound/usb/line6/revision.h b/‎drivers/staging/line6/revision.h renamed to ‎sound/usb/line6/revision.h
diff --git a/‎drivers/staging/line6/toneport.c renamed to ‎sound/usb/line6/toneport.c b/‎drivers/staging/line6/toneport.c renamed to ‎sound/usb/line6/toneport.c
diff --git a/‎drivers/staging/line6/toneport.h renamed to ‎sound/usb/line6/toneport.h b/‎drivers/staging/line6/toneport.h renamed to ‎sound/usb/line6/toneport.h
diff --git a/‎drivers/staging/line6/usbdefs.h renamed to ‎sound/usb/line6/usbdefs.h b/‎drivers/staging/line6/usbdefs.h renamed to ‎sound/usb/line6/usbdefs.h
diff --git a/‎drivers/staging/line6/variax.c renamed to ‎sound/usb/line6/variax.c b/‎drivers/staging/line6/variax.c renamed to ‎sound/usb/line6/variax.c
diff --git a/‎drivers/staging/line6/variax.h renamed to ‎sound/usb/line6/variax.h b/‎drivers/staging/line6/variax.h renamed to ‎sound/usb/line6/variax.h
@@ -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"
 
@@ -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/
 
@@ -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
 
@@ -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/
Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,4 @@ obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o`
`25`	`25`	`obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o`
`26`	`26`
`27`	`27`	`obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/`
	`28`	`+obj-$(CONFIG_LINE6_USB) += line6/`