Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[linux-2.6.git] / include / linux / dmi.h
index a8a3e1a..f156cca 100644 (file)
@@ -20,6 +20,54 @@ enum dmi_device_type {
        DMI_DEV_TYPE_SAS,
        DMI_DEV_TYPE_IPMI = -1,
        DMI_DEV_TYPE_OEM_STRING = -2,
+       DMI_DEV_TYPE_DEV_ONBOARD = -3,
+};
+
+enum dmi_entry_type {
+       DMI_ENTRY_BIOS = 0,
+       DMI_ENTRY_SYSTEM,
+       DMI_ENTRY_BASEBOARD,
+       DMI_ENTRY_CHASSIS,
+       DMI_ENTRY_PROCESSOR,
+       DMI_ENTRY_MEM_CONTROLLER,
+       DMI_ENTRY_MEM_MODULE,
+       DMI_ENTRY_CACHE,
+       DMI_ENTRY_PORT_CONNECTOR,
+       DMI_ENTRY_SYSTEM_SLOT,
+       DMI_ENTRY_ONBOARD_DEVICE,
+       DMI_ENTRY_OEMSTRINGS,
+       DMI_ENTRY_SYSCONF,
+       DMI_ENTRY_BIOS_LANG,
+       DMI_ENTRY_GROUP_ASSOC,
+       DMI_ENTRY_SYSTEM_EVENT_LOG,
+       DMI_ENTRY_PHYS_MEM_ARRAY,
+       DMI_ENTRY_MEM_DEVICE,
+       DMI_ENTRY_32_MEM_ERROR,
+       DMI_ENTRY_MEM_ARRAY_MAPPED_ADDR,
+       DMI_ENTRY_MEM_DEV_MAPPED_ADDR,
+       DMI_ENTRY_BUILTIN_POINTING_DEV,
+       DMI_ENTRY_PORTABLE_BATTERY,
+       DMI_ENTRY_SYSTEM_RESET,
+       DMI_ENTRY_HW_SECURITY,
+       DMI_ENTRY_SYSTEM_POWER_CONTROLS,
+       DMI_ENTRY_VOLTAGE_PROBE,
+       DMI_ENTRY_COOLING_DEV,
+       DMI_ENTRY_TEMP_PROBE,
+       DMI_ENTRY_ELECTRICAL_CURRENT_PROBE,
+       DMI_ENTRY_OOB_REMOTE_ACCESS,
+       DMI_ENTRY_BIS_ENTRY,
+       DMI_ENTRY_SYSTEM_BOOT,
+       DMI_ENTRY_MGMT_DEV,
+       DMI_ENTRY_MGMT_DEV_COMPONENT,
+       DMI_ENTRY_MGMT_DEV_THRES,
+       DMI_ENTRY_MEM_CHANNEL,
+       DMI_ENTRY_IPMI_DEV,
+       DMI_ENTRY_SYS_POWER_SUPPLY,
+       DMI_ENTRY_ADDITIONAL,
+       DMI_ENTRY_ONBOARD_DEV_EXT,
+       DMI_ENTRY_MGMT_CONTROLLER_HOST,
+       DMI_ENTRY_INACTIVE = 126,
+       DMI_ENTRY_END_OF_TABLE = 127,
 };
 
 struct dmi_header {
@@ -37,6 +85,14 @@ struct dmi_device {
 
 #ifdef CONFIG_DMI
 
+struct dmi_dev_onboard {
+       struct dmi_device dev;
+       int instance;
+       int segment;
+       int bus;
+       int devfn;
+};
+
 extern int dmi_check_system(const struct dmi_system_id *list);
 const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list);
 extern const char * dmi_get_system_info(int field);