diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-23 05:07:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-23 05:07:49 -0400 |
| commit | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (patch) | |
| tree | 3f6150291664b4c62e328f6b1dcff79b54db612a /drivers/platform/x86/wmi.c | |
| parent | a6bc3262c561780d2a6587aa3d5715b1e7d8fa13 (diff) | |
| parent | 59fcbddaff6f862cc1584b488866d9c4a5579085 (diff) | |
Merge branches 'irq/sparseirq' and 'linus' into irq/core
Diffstat (limited to 'drivers/platform/x86/wmi.c')
| -rw-r--r-- | drivers/platform/x86/wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 8a8b377712c..2f269e117b8 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) | |||
| 708 | 708 | ||
| 709 | static int __init acpi_wmi_init(void) | 709 | static int __init acpi_wmi_init(void) |
| 710 | { | 710 | { |
| 711 | acpi_status result; | 711 | int result; |
| 712 | 712 | ||
| 713 | INIT_LIST_HEAD(&wmi_blocks.list); | 713 | INIT_LIST_HEAD(&wmi_blocks.list); |
| 714 | 714 | ||