From 1ac83cb625e242df3179b4817bde02ba3526ba4b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 13 Jan 2007 23:04:33 +0100
Subject: [PATCH] --- yaml --- r: 48692 b: refs/heads/master c:
 fac3506100c19391bc5474084dd838f0fb87bf26 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/acpi/sony_acpi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;