diff --git a/[refs] b/[refs]
index f029a34ad2c9..d0084c614894 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b36a50f92d1c4300a88f606b4d2bbdc4f442a2d7
+refs/heads/master: da511997d2bbc09f5e39385e0ed209578db07c91
diff --git a/trunk/drivers/platform/x86/wmi.c b/trunk/drivers/platform/x86/wmi.c
index 8a8b377712c9..2f269e117b8f 100644
--- a/trunk/drivers/platform/x86/wmi.c
+++ b/trunk/drivers/platform/x86/wmi.c
@@ -708,7 +708,7 @@ static int __init acpi_wmi_add(struct acpi_device *device)
 
 static int __init acpi_wmi_init(void)
 {
-	acpi_status result;
+	int result;
 
 	INIT_LIST_HEAD(&wmi_blocks.list);