diff options
| author |   Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-04-24 16:52:52 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-04-24 16:52:52 +0200 |
| commit | 8cad95f56f63a63abab0ff0cb451c0bdd5a885dc (patch) | |
| tree | be7e1ad2d42c6ab61fd8156129c4dd3679da6b7f /include/linux/mod_devicetable.h | |
| parent | video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms (diff) | |
| parent | Linux 4.17-rc2 (diff) | |
| download | wireguard-linux-8cad95f56f63a63abab0ff0cb451c0bdd5a885dc.tar.xz wireguard-linux-8cad95f56f63a63abab0ff0cb451c0bdd5a885dc.zip | |
Merge tag 'v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.17-rc2
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -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 { |