diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-15 01:22:45 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-15 01:22:45 +0400 |
| commit | f3ce717e60572421f56d89c9a85ac42e634d16e7 (patch) | |
| tree | 46b85329773c7908378f90e4e8e86205ebfd229f /drivers/acpi/dock.c | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| parent | e73d3136355f511d3e1c2ef21acf02b19bd2b650 (diff) | |
| download | linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.tar.xz | |
Merge back earlier 'acpi-assorted' material
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 826560753389..c90112ceb570 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -1055,7 +1055,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 (is_dock(handle) || is_ejectable_bay(handle)) |