From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 Aug 2013 23:29:04 +0000 (+0200)
Subject: Merge branch 'acpi-assorted'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0c581415b522267138d807814e526aa7534b9a61;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI / osl: Kill macro INVALID_TABLE().
  earlycpio.c: Fix the confusing comment of find_cpio_data().
  ACPI / x86: Print Hot-Pluggable Field in SRAT.
  ACPI / thermal: Use THERMAL_TRIPS_NONE macro to replace number
  ACPI / thermal: Remove unused macros in the driver/acpi/thermal.c
  ACPI / thermal: Remove the unused lock of struct acpi_thermal
  ACPI / osl: Fix osi_setup_entries[] __initdata attribute location
  ACPI / numa: Fix __init attribute location in slit_valid()
  ACPI / dock: Fix __init attribute location in find_dock_and_bay()
  ACPI / Sleep: Fix incorrect placement of __initdata
  ACPI / processor: Fix incorrect placement of __initdata
  ACPI / EC: Fix incorrect placement of __initdata
  ACPI / scan: Drop unnecessary label from acpi_create_platform_device()
  ACPI: Move acpi_bus_get_device() from bus.c to scan.c
  ACPI / scan: Allow platform device creation without any IO resources
  ACPI: Cleanup sparse warning on acpi_os_initialize1()
  platform / thinkpad: Remove deprecated hotkey_report_mode parameter
  ACPI: Remove the old /proc/acpi/event interface
---

0c581415b522267138d807814e526aa7534b9a61
diff --cc drivers/acpi/dock.c
index b527c1bd8bb2,c90112ceb570..05ea4be01a83
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@@ -908,10 -1055,10 +908,10 @@@ 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))
 +	if (acpi_dock_match(handle) || is_ejectable_bay(handle))
  		dock_add(handle);
  
  	return AE_OK;