diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-10 22:41:59 +0300 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-10 22:41:59 +0300 |
| commit | 49e41801b335f64610bbfd23e8f2bbaf34d46276 (patch) | |
| tree | 4fbedacd1de1bbd4054f07f93031aebcb7b7a919 /include/uapi/linux/input-event-codes.h | |
| parent | b49d564344f773d8afee982153c8493e5f2eaf38 (diff) | |
| parent | bfeffd155283772bbe78c6a05dec7c0128ee500c (diff) | |
| download | linux-49e41801b335f64610bbfd23e8f2bbaf34d46276.tar.xz | |
Merge tag 'v5.0-rc1' into next-general
Linux 5.0-rc1
Sync to pick up LSM stacking work (which is based on -rc1).
Diffstat (limited to 'include/uapi/linux/input-event-codes.h')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index ae366b87426a..7f14d4a66c28 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -716,6 +716,8 @@ * the situation described above. */ #define REL_RESERVED 0x0a +#define REL_WHEEL_HI_RES 0x0b +#define REL_HWHEEL_HI_RES 0x0c #define REL_MAX 0x0f #define REL_CNT (REL_MAX+1) |