diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2018-04-02 19:50:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-04-02 19:50:59 +0200 |
| commit | bc334cb61b9ee6e85b9bb01519989a3ae8fe03f6 (patch) | |
| tree | 34424a812537fe11beeee727b30b19c67193fe36 /include/uapi/linux | |
| parent | ALSA: pcm: potential uninitialized return values (diff) | |
| parent | ALSA: usb-audio: silence a static checker warning (diff) | |
| download | linux-dev-bc334cb61b9ee6e85b9bb01519989a3ae8fe03f6.tar.xz linux-dev-bc334cb61b9ee6e85b9bb01519989a3ae8fe03f6.zip | |
Merge branch 'for-next' into for-linus
Preparation for 4.17 merge.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/usb/audio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h index da3315ed1bcd..3a78e7145689 100644 --- a/include/uapi/linux/usb/audio.h +++ b/include/uapi/linux/usb/audio.h @@ -27,6 +27,7 @@ /* bInterfaceProtocol values to denote the version of the standard used */ #define UAC_VERSION_1 0x00 #define UAC_VERSION_2 0x20 +#define UAC_VERSION_3 0x30 /* A.2 Audio Interface Subclass Codes */ #define USB_SUBCLASS_AUDIOCONTROL 0x01 |