Skip to content

Commit

Permalink
ACPI: update acpi_power_resume() per new acpi_op_resume
Browse files Browse the repository at this point in the history
drivers/acpi/power.c:69: warning: initialization from incompatible pointer type

Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Len Brown committed Feb 16, 2007
1 parent 0a61390 commit e8363f3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/power.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ACPI_MODULE_NAME("acpi_power")
#define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
static int acpi_power_add(struct acpi_device *device);
static int acpi_power_remove(struct acpi_device *device, int type);
static int acpi_power_resume(struct acpi_device *device, int state);
static int acpi_power_resume(struct acpi_device *device);
static int acpi_power_open_fs(struct inode *inode, struct file *file);

static struct acpi_driver acpi_power_driver = {
Expand Down Expand Up @@ -668,7 +668,7 @@ static int acpi_power_remove(struct acpi_device *device, int type)
return 0;
}

static int acpi_power_resume(struct acpi_device *device, int state)
static int acpi_power_resume(struct acpi_device *device)
{
int result = 0;
struct acpi_power_resource *resource = NULL;
Expand Down

0 comments on commit e8363f3

Please sign in to comment.