From: Len Brown <len.brown@intel.com>
Date: Fri, 16 Feb 2007 07:05:39 +0000 (-0500)
Subject: ACPI: update acpi_power_resume() per new acpi_op_resume
X-Git-Tag: v2.6.21-rc1~87^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e8363f332757ac22395fb120cc33b3262f9ee26c;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 784cbdb1084..e768eb36293 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;