Merge branch 'battery' into release

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

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 8953b70..7711d94 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -131,7 +131,7 @@ struct acpi_battery {
        unsigned long flags;
 };
 
        unsigned long flags;
 };
 

-#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
+#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat)

 
 inline int acpi_battery_present(struct acpi_battery *battery)
 {
 
 inline int acpi_battery_present(struct acpi_battery *battery)
 {


@@ -871,7 +871,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
                }, \
        }
 
                }, \
        }
 

-static struct battery_file {
+static const struct battery_file {

        struct file_operations ops;
        mode_t mode;
        const char *name;
        struct file_operations ops;
        mode_t mode;
        const char *name;