diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-10 19:03:46 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-10 19:03:46 +0300 |
| commit | 05adb1850aaa88d3d4cc40a531752816899cc1bf (patch) | |
| tree | 5c6f9630a7a723012a75273fda4b06505a7152fc /include/uapi/linux/usb | |
| parent | 957870f9341201b176e41eb5fa8a750b13e501aa (diff) | |
| parent | 282d0a35c8c42c3ac4dd86a7e408ed1b30db4897 (diff) | |
| download | linux-05adb1850aaa88d3d4cc40a531752816899cc1bf.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Pull in latest drm-next from Dave Airlie to get at all the drm-misc
goodies, specifically:
- dma_fence error state handling rework (Chris needs that for error
recovery)
- crc support locking changes (Tomeu's i915 crc patches need that).
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/uapi/linux/usb')
| -rw-r--r-- | include/uapi/linux/usb/functionfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index acc63697a0cc..b2a31a55a612 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -93,6 +93,7 @@ struct usb_ext_prop_desc { * | 0 | magic | LE32 | FUNCTIONFS_DESCRIPTORS_MAGIC_V2 | * | 4 | length | LE32 | length of the whole data chunk | * | 8 | flags | LE32 | combination of functionfs_flags | + * | | eventfd | LE32 | eventfd file descriptor | * | | fs_count | LE32 | number of full-speed descriptors | * | | hs_count | LE32 | number of high-speed descriptors | * | | ss_count | LE32 | number of super-speed descriptors | |