diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /drivers/acpi/sbs.c | |
| parent | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff) | |
| parent | eed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff) | |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'drivers/acpi/sbs.c')
| -rw-r--r-- | drivers/acpi/sbs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 52b9db8afc20..b16ddbf23a9c 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
| @@ -822,7 +822,10 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) | |||
| 822 | 822 | ||
| 823 | static void acpi_battery_remove(struct acpi_sbs *sbs, int id) | 823 | static void acpi_battery_remove(struct acpi_sbs *sbs, int id) |
| 824 | { | 824 | { |
| 825 | #if defined(CONFIG_ACPI_SYSFS_POWER) || defined(CONFIG_ACPI_PROCFS_POWER) | ||
| 825 | struct acpi_battery *battery = &sbs->battery[id]; | 826 | struct acpi_battery *battery = &sbs->battery[id]; |
| 827 | #endif | ||
| 828 | |||
| 826 | #ifdef CONFIG_ACPI_SYSFS_POWER | 829 | #ifdef CONFIG_ACPI_SYSFS_POWER |
| 827 | if (battery->bat.dev) { | 830 | if (battery->bat.dev) { |
| 828 | if (battery->have_sysfs_alarm) | 831 | if (battery->have_sysfs_alarm) |