summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 02:05:39 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 02:05:39 -0500
commite8363f332757ac22395fb120cc33b3262f9ee26c (patch)
treed9f5b60781100158f831a83869bc81137a706c52 /drivers/acpi/power.c
parent0a6139027f3986162233adc17285151e78b39cac (diff)
downloadlinux-e8363f332757ac22395fb120cc33b3262f9ee26c.tar.bz2
ACPI: update acpi_power_resume() per new acpi_op_resume
drivers/acpi/power.c:69: warning: initialization from incompatible pointer type Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 784cbdb1084b..e768eb362932 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -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 = {
@@ -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;