diff options
-rw-r--r-- | drivers/acpi/osl.c | 12 | ||||
-rw-r--r-- | drivers/firmware/dmi_scan.c | 9 | ||||
-rw-r--r-- | include/linux/dmi.h | 2 |
3 files changed, 6 insertions, 17 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index e53fb516f9d4..347cda21c0ed 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -1220,17 +1220,17 @@ int acpi_dmi_dump(void) | |||
1220 | return -1; | 1220 | return -1; |
1221 | 1221 | ||
1222 | printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n", | 1222 | printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n", |
1223 | dmi_get_slot(DMI_SYS_VENDOR)); | 1223 | dmi_get_system_info(DMI_SYS_VENDOR)); |
1224 | printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n", | 1224 | printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n", |
1225 | dmi_get_slot(DMI_PRODUCT_NAME)); | 1225 | dmi_get_system_info(DMI_PRODUCT_NAME)); |
1226 | printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n", | 1226 | printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n", |
1227 | dmi_get_slot(DMI_PRODUCT_VERSION)); | 1227 | dmi_get_system_info(DMI_PRODUCT_VERSION)); |
1228 | printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n", | 1228 | printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n", |
1229 | dmi_get_slot(DMI_BOARD_NAME)); | 1229 | dmi_get_system_info(DMI_BOARD_NAME)); |
1230 | printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n", | 1230 | printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n", |
1231 | dmi_get_slot(DMI_BIOS_VENDOR)); | 1231 | dmi_get_system_info(DMI_BIOS_VENDOR)); |
1232 | printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n", | 1232 | printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n", |
1233 | dmi_get_slot(DMI_BIOS_DATE)); | 1233 | dmi_get_system_info(DMI_BIOS_DATE)); |
1234 | 1234 | ||
1235 | return 0; | 1235 | return 0; |
1236 | } | 1236 | } |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 9008ed5ef4ce..e0bade732376 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
@@ -489,12 +489,3 @@ int dmi_get_year(int field) | |||
489 | 489 | ||
490 | return year; | 490 | return year; |
491 | } | 491 | } |
492 | |||
493 | /** | ||
494 | * dmi_get_slot - return dmi_ident[slot] | ||
495 | * @slot: index into dmi_ident[] | ||
496 | */ | ||
497 | char *dmi_get_slot(int slot) | ||
498 | { | ||
499 | return(dmi_ident[slot]); | ||
500 | } | ||
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 5b42a659a308..b1251b2af568 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h | |||
@@ -79,7 +79,6 @@ extern void dmi_scan_machine(void); | |||
79 | extern int dmi_get_year(int field); | 79 | extern int dmi_get_year(int field); |
80 | extern int dmi_name_in_vendors(const char *str); | 80 | extern int dmi_name_in_vendors(const char *str); |
81 | extern int dmi_available; | 81 | extern int dmi_available; |
82 | extern char *dmi_get_slot(int slot); | ||
83 | 82 | ||
84 | #else | 83 | #else |
85 | 84 | ||
@@ -90,7 +89,6 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na | |||
90 | static inline int dmi_get_year(int year) { return 0; } | 89 | static inline int dmi_get_year(int year) { return 0; } |
91 | static inline int dmi_name_in_vendors(const char *s) { return 0; } | 90 | static inline int dmi_name_in_vendors(const char *s) { return 0; } |
92 | #define dmi_available 0 | 91 | #define dmi_available 0 |
93 | static inline char *dmi_get_slot(int slot) { return NULL; } | ||
94 | 92 | ||
95 | #endif | 93 | #endif |
96 | 94 | ||