summaryrefslogtreecommitdiff
path: root/drivers/misc/mei/hw.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-16 17:05:45 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-16 17:05:45 +0300
commit5593edfbfa30a049fca9abbd70a834d2888a4d9d (patch)
treea5c67524a82995fa17e44669c037fcced4fa91aa /drivers/misc/mei/hw.h
parent113ccc38378b6f0b24c0993040c6044e35163a51 (diff)
parent49def1853334396f948dcb4cedb9347abb318df5 (diff)
downloadlinux-5593edfbfa30a049fca9abbd70a834d2888a4d9d.tar.xz
Merge 4.10-rc4 into driver-core-next
We want the sysfs file revert and other fixes in here as well for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hw.h')
-rw-r--r--drivers/misc/mei/hw.h6
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 */