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/dmi-id.c | |
| parent | 3645ca8359328ea4c75bce4af54ad24028381f30 (diff) | |
| parent | a1bd4e35e8d9df24db7d7addd74cbfcc87ec9fb3 (diff) | |
Pull dmi-2.6.24 into release branch
Diffstat (limited to 'drivers/firmware/dmi-id.c')
| -rw-r--r-- | drivers/firmware/dmi-id.c | 2 |
1 files changed, 0 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; | |||
| 173 | if (dmi_get_system_info(_field)) \ | 173 | if (dmi_get_system_info(_field)) \ |
| 174 | sys_dmi_attributes[i++] = &sys_dmi_##_name##_attr.dev_attr.attr; | 174 | sys_dmi_attributes[i++] = &sys_dmi_##_name##_attr.dev_attr.attr; |
| 175 | 175 | ||
| 176 | extern int dmi_available; | ||
| 177 | |||
| 178 | /* In a separate function to keep gcc 3.2 happy - do NOT merge this in | 176 | /* In a separate function to keep gcc 3.2 happy - do NOT merge this in |
| 179 | dmi_id_init! */ | 177 | dmi_id_init! */ |
| 180 | static void __init dmi_id_init_attr_table(void) | 178 | static void __init dmi_id_init_attr_table(void) |