diff --git a/[refs] b/[refs] index f1f447c74c64..d1c19f5ebe81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b38bb5f7f06356a89bb2cbf92ad346025e95192 +refs/heads/master: 32d47eeff05981bfb89a95747eb182bc12630d58 diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c index 966feddf6b1b..f7227e990b0f 100644 --- a/trunk/drivers/acpi/osl.c +++ b/trunk/drivers/acpi/osl.c @@ -1530,7 +1530,7 @@ acpi_status __init acpi_os_initialize(void) return AE_OK; } -acpi_status acpi_os_initialize1(void) +acpi_status __init acpi_os_initialize1(void) { kacpid_wq = create_workqueue("kacpid"); kacpi_notify_wq = create_workqueue("kacpi_notify");