diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 18:12:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 18:12:18 -0800 |
| commit | d45187aaf0e256d23da2f7694a7826524499aa31 (patch) | |
| tree | 6f3075ba02bb8e1efc4e590deef654df8868e6a9 /include | |
| parent | 4e5448a31d73d0e944b7adb9049438a09bc332cb (diff) | |
| parent | e5b6c1518878e157df4121c1caf70d9c470a6d31 (diff) | |
| download | linux-d45187aaf0e256d23da2f7694a7826524499aa31.tar.bz2 | |
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: Save SMBIOS Type 9 System Slots
firmware: dmi_scan: Fix dmi_find_device description
firmware: dmi_scan: Clarify dmi_save_extended_devices
firmware: dmi_scan: Optimize dmi_save_extended_devices
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 5055ac34142d..5e9c74cf8894 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -22,6 +22,7 @@ enum dmi_device_type { DMI_DEV_TYPE_IPMI = -1, DMI_DEV_TYPE_OEM_STRING = -2, DMI_DEV_TYPE_DEV_ONBOARD = -3, + DMI_DEV_TYPE_DEV_SLOT = -4, }; enum dmi_entry_type { |