nfsd: track last inode only in use_wgather case

[safe/jmp/linux-2.6] / drivers / firmware / dmi-id.c

diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index bc132d8..5a76d05 100644 (file)
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <linux/dmi.h>
 #include <linux/device.h>
-#include <linux/autoconf.h>
 
 struct dmi_device_attribute{
        struct device_attribute dev_attr;
@@ -173,8 +172,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)
@@ -226,7 +223,7 @@ static int __init dmi_id_init(void)
        }
 
        dmi_dev->class = &dmi_class;
-       strcpy(dmi_dev->bus_id, "id");
+       dev_set_name(dmi_dev, "id");
        dmi_dev->groups = sys_dmi_attribute_groups;
 
        ret = device_register(dmi_dev);