diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 16:32:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 16:32:16 -0700 |
| commit | 71893f116109c92e4cd230d990fad5bd7cb4f99d (patch) | |
| tree | 4c9b5b407907f3a7aaa2370fbe98e18e4dfaed66 /include | |
| parent | Merge tag 'chrome-platform-for-linus-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform (diff) | |
| parent | firmware: dmi_scan: Use lowercase letters for UUID (diff) | |
| download | linux-dev-71893f116109c92e4cd230d990fad5bd7cb4f99d.tar.xz linux-dev-71893f116109c92e4cd230d990fad5bd7cb4f99d.zip | |
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull dmi updates from Jean Delvare.
* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
firmware: dmi_scan: Use lowercase letters for UUID
firmware: dmi_scan: Add DMI_OEM_STRING support to dmi_matches
firmware: dmi_scan: Fix UUID length safety check
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mod_devicetable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 48fb2b43c35a..7d361be2e24f 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -502,6 +502,7 @@ enum dmi_field { DMI_CHASSIS_SERIAL, DMI_CHASSIS_ASSET_TAG, DMI_STRING_MAX, + DMI_OEM_STRING, /* special case - will not be in dmi_ident */ }; struct dmi_strmatch { |