Merge branch 'battery' into release
[linux-2.6.git] / drivers / acpi / battery.c
index 8953b70870915bdacbdfb5038a82393e25ba4382..7711d94a04091442fcf7bf261c09d7db93186ebc 100644 (file)
@@ -131,7 +131,7 @@ struct acpi_battery {
        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)
 {
@@ -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;