summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorShem Multinymous <multinymous@gmail.com>2006-09-29 10:59:37 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 18:18:09 +0200
commit2e0c1f6ce7b816f63fea2af3e5e2cb20c66430e9 (patch)
tree9ee9f9d5d1aff04df6d0974883d8817a980dfa37 /include
parent[PATCH] timer: add lock annotation to lock_timer_base (diff)
downloadlinux-2e0c1f6ce7b816f63fea2af3e5e2cb20c66430e9.tar.xz
linux-2e0c1f6ce7b816f63fea2af3e5e2cb20c66430e9.zip
[PATCH] DMI: Decode and save OEM String information
This teaches dmi_decode() how to decode and save OEM Strings (type 11) DMI information, which is currently discarded silently. Existing code using DMI is not affected. Follows the "System Management BIOS (SMBIOS) Specification" (http://www.dmtf.org/standards/smbios), and also the userspace dmidecode.c code. OEM Strings are the only safe way to identify some hardware, e.g., the ThinkPad embedded controller used by the soon-to-be-submitted tp_smapi driver. This will also let us eliminate the long whitelist in the mainline hdaps driver (in a future patch). Signed-off-by: Shem Multinymous <multinymous@gmail.com> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/dmi.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index b2cd2071d432..38dc403be70b 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -27,7 +27,8 @@ enum dmi_device_type {
DMI_DEV_TYPE_ETHERNET,
DMI_DEV_TYPE_TOKENRING,
DMI_DEV_TYPE_SOUND,
- DMI_DEV_TYPE_IPMI = -1
+ DMI_DEV_TYPE_IPMI = -1,
+ DMI_DEV_TYPE_OEM_STRING = -2
};
struct dmi_header {