diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-23 23:50:01 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-23 23:50:01 -0500 |
| commit | 63eac9badbe35054c0ae61a9dbcf4830c7429040 (patch) | |
| tree | 2bea2d6df5f2dc9306c9fc17c8755ed3c56d4a12 /drivers/firmware | |
| parent | 3645ca8359328ea4c75bce4af54ad24028381f30 (diff) | |
| parent | a1bd4e35e8d9df24db7d7addd74cbfcc87ec9fb3 (diff) | |
| download | talos-obmc-linux-63eac9badbe35054c0ae61a9dbcf4830c7429040.tar.gz talos-obmc-linux-63eac9badbe35054c0ae61a9dbcf4830c7429040.zip | |
Pull dmi-2.6.24 into release branch
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/dmi-id.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/dmi_scan.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index bc132d8f79cb..313c99cbdc62 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c @@ -173,8 +173,6 @@ static struct device *dmi_dev; if (dmi_get_system_info(_field)) \ sys_dmi_attributes[i++] = &sys_dmi_##_name##_attr.dev_attr.attr; -extern int dmi_available; - /* In a separate function to keep gcc 3.2 happy - do NOT merge this in dmi_id_init! */ static void __init dmi_id_init_attr_table(void) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 0cdadea7a40e..5e596a7e3601 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -470,3 +470,11 @@ int dmi_get_year(int field) return year; } +/** + * dmi_get_slot - return dmi_ident[slot] + * @slot: index into dmi_ident[] + */ +char *dmi_get_slot(int slot) +{ + return(dmi_ident[slot]); +} |
