Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e8363f332757ac22395fb120cc33b3262f9ee26c
Commit: e8363f332757ac22395fb120cc33b3262f9ee26c
Parent: 0a6139027f3986162233adc17285151e78b39cac
Author: Len Brown <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 16 02:05:39 2007 -0500
Committer: Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Feb 16 02:05:39 2007 -0500
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 <[EMAIL PROTECTED]>
---
drivers/acpi/power.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 784cbdb..e768eb3 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
