summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-13 07:41:15 +0100
committerTakashi Iwai <tiwai@suse.de>2014-11-13 07:41:15 +0100
commitadf1121398f5b65a04355503b5335bb59de0c524 (patch)
tree4806ff219ec8a22b511d8c3c19880e276dad9609
parent5de168ec80dbd9167fe81ac686169942ac3f726e (diff)
parentd65e55a507ef30fa166b56763170e2cf8b8f75f4 (diff)
downloadalsa-driver-build-unstable-adf1121398f5b65a04355503b5335bb59de0c524.tar.gz
Merge remote-tracking branch 'stable/build' into build
-rw-r--r--alsa/usb/mixer_scarlett.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/alsa/usb/mixer_scarlett.c b/alsa/usb/mixer_scarlett.c
new file mode 100644
index 000000000..89f4e156c
--- /dev/null
+++ b/alsa/usb/mixer_scarlett.c
@@ -0,0 +1,3 @@
+#define __NO_VERSION__
+#include "usbaudio.inc"
+#include "../alsa-kernel/usb/mixer_scarlett.c"