diff options
| author | Linus Walleij | 2017-01-30 14:39:20 +0100 |
|---|---|---|
| committer | Linus Walleij | 2017-01-30 14:39:20 +0100 |
| commit | 7f36f5d11cda050b118f76d774151427a18d15ef (patch) | |
| tree | 9d4fa3b830785b767525a5e6a065fe4297cd8112 /drivers/misc/mei/hw.h | |
| parent | 2b24efa8e5c5042b0f126c09622b3e9e3c86a4fa (diff) | |
| parent | 566cf877a1fcb6d6dc0126b076aad062054c2637 (diff) | |
Merge tag 'v4.10-rc6' into devel
Linux 4.10-rc6
Resolved conflicts in:
drivers/pinctrl/pinctrl-amd.c
drivers/pinctrl/samsung/pinctrl-exynos.c
Diffstat (limited to 'drivers/misc/mei/hw.h')
| -rw-r--r-- | drivers/misc/mei/hw.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/misc/mei/hw.h b/drivers/misc/mei/hw.h index 9daf3f9aed25..e1e4d47d4d7d 100644 --- a/drivers/misc/mei/hw.h +++ b/drivers/misc/mei/hw.h @@ -76,6 +76,12 @@ #define HBM_MINOR_VERSION_FA 0 #define HBM_MAJOR_VERSION_FA 2 +/* + * MEI version with OS ver message support + */ +#define HBM_MINOR_VERSION_OS 0 +#define HBM_MAJOR_VERSION_OS 2 + /* Host bus message command opcode */ #define MEI_HBM_CMD_OP_MSK 0x7f /* Host bus message command RESPONSE */ |