From d62f780fa591800b5980b28dc6fdf3d5ad62ad1e Mon Sep 17 00:00:00 2001 From: Len Brown Date: Fri, 16 Feb 2007 02:05:39 -0500 Subject: [PATCH] --- yaml --- r: 48716 b: refs/heads/master c: e8363f332757ac22395fb120cc33b3262f9ee26c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/power.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 31262f7272d2..4d63777b95cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a6139027f3986162233adc17285151e78b39cac +refs/heads/master: e8363f332757ac22395fb120cc33b3262f9ee26c diff --git a/trunk/drivers/acpi/power.c b/trunk/drivers/acpi/power.c index 784cbdb1084b..e768eb362932 100644 --- a/trunk/drivers/acpi/power.c +++ b/trunk/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;