Merge branch 'linus' into release

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

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 2abc036..b0de631 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -763,7 +763,6 @@ static int acpi_battery_add_fs(struct acpi_device *device)
                                                     acpi_battery_dir);
                if (!acpi_device_dir(device))
                        return -ENODEV;
-               acpi_device_dir(device)->owner = THIS_MODULE;
        }
 
        for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {