Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[pandora-kernel.git] / drivers / acpi / system.c

diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index a206a12..743f244 100644 (file)
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -101,6 +101,7 @@ static void acpi_table_attr_init(struct acpi_table_attr *table_attr,
        struct acpi_table_header *header = NULL;
        struct acpi_table_attr *attr = NULL;
 
+       sysfs_attr_init(&table_attr->attr.attr);
        if (table_header->signature[0] != '\0')
                memcpy(table_attr->name, table_header->signature,
                        ACPI_NAME_SIZE);
@@ -475,6 +476,7 @@ void acpi_irq_stats_init(void)
                        goto fail;
                strncpy(name, buffer, strlen(buffer) + 1);
 
+               sysfs_attr_init(&counter_attrs[i].attr);
                counter_attrs[i].attr.name = name;
                counter_attrs[i].attr.mode = 0644;
                counter_attrs[i].show = counter_show;