diff options
| author | Ingo Molnar <[email protected]> | 2016-10-16 13:04:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-10-16 13:04:34 +0200 |
| commit | 4d69f155d58d0f75c5404ea502178b1943a04755 (patch) | |
| tree | fe5b7608f05f6951fce748ea1e93d942b52902bd /include/uapi/linux/usb | |
| parent | c474e50711aa79b7bd0ea30b44744baca5650375 (diff) | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'include/uapi/linux/usb')
| -rw-r--r-- | include/uapi/linux/usb/functionfs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index 108dd7997014..acc63697a0cc 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -21,6 +21,8 @@ enum functionfs_flags { FUNCTIONFS_HAS_MS_OS_DESC = 8, FUNCTIONFS_VIRTUAL_ADDR = 16, FUNCTIONFS_EVENTFD = 32, + FUNCTIONFS_ALL_CTRL_RECIP = 64, + FUNCTIONFS_CONFIG0_SETUP = 128, }; /* Descriptor of an non-audio endpoint */ |