Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / drivers / acpi / sbs.c

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index d0033250b5a9c82e9d52c3639a0ff0193c9af77e..6050ce4818731fd2bcf8c6891d5a343414d0133a 100644 (file)
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -463,7 +463,7 @@ static ssize_t acpi_battery_alarm_store(struct device *dev,
 }
 
 static struct device_attribute alarm_attr = {
-       .attr = {.name = "alarm", .mode = 0644, .owner = THIS_MODULE},
+       .attr = {.name = "alarm", .mode = 0644},
        .show = acpi_battery_alarm_show,
        .store = acpi_battery_alarm_store,
 };