summaryrefslogtreecommitdiff
path: root/drivers/platform/x86/wmi.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-18 09:57:02 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-18 09:57:02 +0100
commit37ba317c9ed19eb126e40bbf563f2711e191a636 (patch)
treec5865768f341fc0ab41899fe9af9dc5918784cee /drivers/platform/x86/wmi.c
parent708dc5125309cd33c5daaad3026cc4ae6ef39c8b (diff)
parentee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff)
downloadlwn-37ba317c9ed19eb126e40bbf563f2711e191a636.tar.gz
lwn-37ba317c9ed19eb126e40bbf563f2711e191a636.zip
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'drivers/platform/x86/wmi.c')
-rw-r--r--drivers/platform/x86/wmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 8a8b377712c9..2f269e117b8f 100644
--- a/drivers/platform/x86/wmi.c
+++ b/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);