projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm/tegra/for-3.19-rc1-fixes' of git://people.freedesktop.org/~tagr/linux...
[cascardo/linux.git]
/
sound
/
usb
/
mixer_scarlett.c
diff --git
a/sound/usb/mixer_scarlett.c
b/sound/usb/mixer_scarlett.c
index
9109652
..
7438e7c
100644
(file)
--- a/
sound/usb/mixer_scarlett.c
+++ b/
sound/usb/mixer_scarlett.c
@@
-655,7
+655,7
@@
static struct scarlett_device_info s6i6_info = {
.names = NULL
},
- .num_controls =
0
,
+ .num_controls =
9
,
.controls = {
{ .num = 0, .type = SCARLETT_OUTPUTS, .name = "Monitor" },
{ .num = 1, .type = SCARLETT_OUTPUTS, .name = "Headphone" },