diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-06 15:31:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-06 15:31:00 -0500 |
| commit | 57e1c5c87db512629dd44ddeb882a5aaf0e4299e (patch) | |
| tree | e71e8a132d4f696beeae1bdab59efeed9517ba66 /drivers/acpi/battery.c | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
| parent | 76a2e849df47697706024262a8bbb83432b8bde7 (diff) | |
Pull test into release branch
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 5f43e0d1489..2f4521a48fe 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -64,7 +64,7 @@ extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); static int acpi_battery_add(struct acpi_device *device); static int acpi_battery_remove(struct acpi_device *device, int type); -static int acpi_battery_resume(struct acpi_device *device, int status); +static int acpi_battery_resume(struct acpi_device *device); static struct acpi_driver acpi_battery_driver = { .name = ACPI_BATTERY_DRIVER_NAME, @@ -753,7 +753,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type) } /* this is needed to learn about changes made in suspended state */ -static int acpi_battery_resume(struct acpi_device *device, int state) +static int acpi_battery_resume(struct acpi_device *device) { struct acpi_battery *battery; |