Merge branch 'pm-cpuidle'

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / dock.c

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index b527c1bd8bb2aaf2b27c73b4a24e86d9d3a8202f..05ea4be01a832ccb3d8b38e4318c66fee0f83a89 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -908,7 +908,7 @@ err_unregister:
  *
  * This is called by acpi_walk_namespace to look for dock stations and bays.
  */
-static __init acpi_status
+static acpi_status __init
 find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
        if (acpi_dock_match(handle) || is_ejectable_bay(handle))