diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
| commit | 4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch) | |
| tree | db2b279c1ef40e8170883efd1c0bd118d1803aec /include | |
| parent | b153532021104be5cc1abc3b6b60c004739b31c7 (diff) | |
| parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) | |
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb_usual.h | 4 | ||||
| -rw-r--r-- | include/uapi/drm/drm_mode.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index bf99cd01be20..630356866030 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h @@ -66,7 +66,9 @@ US_FLAG(INITIAL_READ10, 0x00100000) \ /* Initial READ(10) (and others) must be retried */ \ US_FLAG(WRITE_CACHE, 0x00200000) \ - /* Write Cache status is not available */ + /* Write Cache status is not available */ \ + US_FLAG(NEEDS_CAP16, 0x00400000) + /* cannot handle READ_CAPACITY_10 */ #define US_FLAG(name, value) US_FL_##name = value , enum { US_DO_ALL_FLAGS }; diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 090e5331ab7e..cc2e00eac2f1 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -223,6 +223,8 @@ struct drm_mode_get_connector { __u32 connection; __u32 mm_width, mm_height; /**< HxW in millimeters */ __u32 subpixel; + + __u32 pad; }; #define DRM_MODE_PROP_PENDING (1<<0) |