diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
| commit | 241bc82e62b28fdb7223b85180fd814f4963c971 (patch) | |
| tree | f0d1a3889fd027e017faa37fc34bffe2fa038c41 /sound/usb/mixer.h | |
| parent | 3a93d082bacf887b47737c4b75c083dea7570832 (diff) | |
| parent | 88c54cdf61f508ebcf8da2d819f5dfc03e954d1d (diff) | |
| download | blackbird-obmc-linux-241bc82e62b28fdb7223b85180fd814f4963c971.tar.gz blackbird-obmc-linux-241bc82e62b28fdb7223b85180fd814f4963c971.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/core/control.c
Diffstat (limited to 'sound/usb/mixer.h')
| -rw-r--r-- | sound/usb/mixer.h | 1 |
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; }; |
