x86: make mp_bus_id_to_type optional

[linux-2.6] / include / linux / dmi.h

diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index 5b42a659a308d046a886ca86fd05e260822a77b4..325acdf5c4625c468f2f6108706ecb971efd856e 100644 (file)
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -35,8 +35,11 @@ enum dmi_device_type {
        DMI_DEV_TYPE_ETHERNET,
        DMI_DEV_TYPE_TOKENRING,
        DMI_DEV_TYPE_SOUND,
+       DMI_DEV_TYPE_PATA,
+       DMI_DEV_TYPE_SATA,
+       DMI_DEV_TYPE_SAS,
        DMI_DEV_TYPE_IPMI = -1,
-       DMI_DEV_TYPE_OEM_STRING = -2
+       DMI_DEV_TYPE_OEM_STRING = -2,
 };
 
 struct dmi_header {
@@ -79,7 +82,7 @@ extern void dmi_scan_machine(void);
 extern int dmi_get_year(int field);
 extern int dmi_name_in_vendors(const char *str);
 extern int dmi_available;
-extern char *dmi_get_slot(int slot);
+extern int dmi_walk(void (*decode)(const struct dmi_header *));
 
 #else
 
@@ -90,7 +93,8 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na
 static inline int dmi_get_year(int year) { return 0; }
 static inline int dmi_name_in_vendors(const char *s) { return 0; }
 #define dmi_available 0
-static inline char *dmi_get_slot(int slot) { return NULL; }
+static inline int dmi_walk(void (*decode)(const struct dmi_header *))
+       { return -1; }
 
 #endif