diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:33:04 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:33:04 +0100 |
| commit | edaea3d904af805545073070307ca5f3afce4e18 (patch) | |
| tree | cc72b4106437007220592ff068207471a3e41edd /drivers/hid/intel-ish-hid/ishtp/hbm.h | |
| parent | 487b6d0c876e83ecd833f8abbf98181f1bb058ae (diff) | |
| parent | 1578461a18596cf33093b392d1b7853ba4276154 (diff) | |
| download | linux-edaea3d904af805545073070307ca5f3afce4e18.tar.bz2 | |
Merge branch 'for-5.1/ish' into for-linus
Power management improvements from Song Hongyan
Switch to new UUID API from Andy Shevchenko
Generalization the driver bindin to support more than just sensors from Srinivas Pandruvada
Diffstat (limited to 'drivers/hid/intel-ish-hid/ishtp/hbm.h')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/hbm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/hbm.h b/drivers/hid/intel-ish-hid/ishtp/hbm.h index d96111cef7f8..7286e3600140 100644 --- a/drivers/hid/intel-ish-hid/ishtp/hbm.h +++ b/drivers/hid/intel-ish-hid/ishtp/hbm.h @@ -149,7 +149,7 @@ struct hbm_host_enum_response { } __packed; struct ishtp_client_properties { - uuid_le protocol_name; + guid_t protocol_name; uint8_t protocol_version; uint8_t max_number_of_connections; uint8_t fixed_address; |