ALSA: line6: Move the contents of usbdefs.h into driver.h
authorTakashi Iwai <tiwai@suse.de>
Wed, 28 Jan 2015 13:50:08 +0000 (14:50 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 28 Jan 2015 19:54:45 +0000 (20:54 +0100)
Most of them are rather relevant with the definitions in driver.h,
and there are only a few lines, so just rip it off.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/line6/driver.c
sound/usb/line6/driver.h
sound/usb/line6/midi.c
sound/usb/line6/pcm.h
sound/usb/line6/pod.c
sound/usb/line6/podhd.c
sound/usb/line6/toneport.c
sound/usb/line6/usbdefs.h [deleted file]
sound/usb/line6/variax.c

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