diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 17:01:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 17:01:44 +0100 |
| commit | 39461ffdfc974147ad0f3cc0da397a999adc25b1 (patch) | |
| tree | 7358951dcc952436cfa09072f376637c6f807984 /drivers/misc/mei/hw.h | |
| parent | b0f2d7d546d37697d3f50753904f6f0c549b62bc (diff) | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| download | linux-39461ffdfc974147ad0f3cc0da397a999adc25b1.tar.gz linux-39461ffdfc974147ad0f3cc0da397a999adc25b1.tar.bz2 linux-39461ffdfc974147ad0f3cc0da397a999adc25b1.zip | |
Merge 4.10-rc4 into char-misc-next
We want the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 */ |