1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index b6e1eb77d148..313c99cbdc62 100644
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -173,14 +173,11 @@ 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;
-
-static int __init dmi_id_init(void)
+/* 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)
 {
-        int ret, i;
-
-        if (!dmi_available)
-                return -ENODEV;
+        int i;
 
         /* Not necessarily all DMI fields are available on all
          * systems, hence let's built an attribute table of just
@@ -205,6 +202,16 @@ static int __init dmi_id_init(void)
         ADD_DMI_ATTR(chassis_serial,    DMI_CHASSIS_SERIAL);
         ADD_DMI_ATTR(chassis_asset_tag, DMI_CHASSIS_ASSET_TAG);
         sys_dmi_attributes[i++] = &sys_dmi_modalias_attr.attr;
+}
+
+static int __init dmi_id_init(void)
+{
+        int ret;
+
+        if (!dmi_available)
+                return -ENODEV;
+
+        dmi_id_init_attr_table();
 
         ret = class_register(&dmi_class);
         if (ret)