diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-12 15:19:16 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-12 15:19:16 -0500 |
| commit | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (patch) | |
| tree | 17852dd654c37bf86cf3d98c692eef4c6fa73a2c /drivers/acpi/wmi.c | |
| parent | 7cc718d56c8297bd3a3c106ca09e8abf9814bb27 (diff) | |
| parent | 96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/wmi.c')
| -rw-r--r-- | drivers/acpi/wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c index 36b84ab418dd..457ed3d3f51c 100644 --- a/drivers/acpi/wmi.c +++ b/drivers/acpi/wmi.c | |||
| @@ -673,11 +673,11 @@ static int __init acpi_wmi_init(void) | |||
| 673 | { | 673 | { |
| 674 | acpi_status result; | 674 | acpi_status result; |
| 675 | 675 | ||
| 676 | INIT_LIST_HEAD(&wmi_blocks.list); | ||
| 677 | |||
| 676 | if (acpi_disabled) | 678 | if (acpi_disabled) |
| 677 | return -ENODEV; | 679 | return -ENODEV; |
| 678 | 680 | ||
| 679 | INIT_LIST_HEAD(&wmi_blocks.list); | ||
| 680 | |||
| 681 | result = acpi_bus_register_driver(&acpi_wmi_driver); | 681 | result = acpi_bus_register_driver(&acpi_wmi_driver); |
| 682 | 682 | ||
| 683 | if (result < 0) { | 683 | if (result < 0) { |