summaryrefslogtreecommitdiff
path: root/sound/usb/mixer.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-08-25 12:07:13 +0300
committerIngo Molnar <mingo@kernel.org>2017-08-25 12:07:13 +0300
commit3a9ff4fd04cc6ad199419508c8ea6eb839e0262d (patch)
treef3933b082ea1743e63e93a16190c6ce32175c96a /sound/usb/mixer.h
parent9c8783201cb58e9af8ddeb0cc68f37b0a44ca16c (diff)
parent90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff)
downloadlinux-3a9ff4fd04cc6ad199419508c8ea6eb839e0262d.tar.xz
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/usb/mixer.h')
-rw-r--r--sound/usb/mixer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index 3417ef347e40..2b4b067646ab 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -64,6 +64,7 @@ struct usb_mixer_elem_info {
int cached;
int cache_val[MAX_CHANNELS];
u8 initialized;
+ u8 min_mute;
void *private_data;
};