diff --git a/[refs] b/[refs] index 7cff49408607..0fcc22223583 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f4f461fa816815b9338047a29cf2521f23f1783 +refs/heads/master: fac3506100c19391bc5474084dd838f0fb87bf26 diff --git a/trunk/drivers/acpi/sony_acpi.c b/trunk/drivers/acpi/sony_acpi.c index beb56b9df5c8..f323c2c40a11 100644 --- a/trunk/drivers/acpi/sony_acpi.c +++ b/trunk/drivers/acpi/sony_acpi.c @@ -233,7 +233,7 @@ static int sony_acpi_write(struct file *file, const char __user *buffer, return count; } -static int sony_acpi_resume(struct acpi_device *device, int state) +static int sony_acpi_resume(struct acpi_device *device) { struct sony_acpi_value *item;