From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 28 Jun 2013 11:00:38 +0000 (+0200)
Subject: Merge branch 'acpi-assorted'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bdc8f09685a25a12f2f5282f56672ba663ecb88c;p=deliverable%2Flinux.git

Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan
  ACPI: Add CMOS RTC Operation Region handler support
  ACPI: Remove unused flags in acpi_device_flags
  ACPI: Remove useless initializers
  ACPI / battery: Make sure all spaces are in correct places
  ACPI: add _STA evaluation at do_acpi_find_child()
  ACPI / EC: access user space with get_user()/put_user()
---

bdc8f09685a25a12f2f5282f56672ba663ecb88c
diff --cc drivers/acpi/internal.h
index 520073ba36b4,4163d4ba0175..3a50a34fe176
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -51,9 -45,12 +51,14 @@@ void acpi_memory_hotplug_init(void)
  #else
  static inline void acpi_memory_hotplug_init(void) {}
  #endif
+ #ifdef CONFIG_X86
+ void acpi_cmos_rtc_init(void);
+ #else
+ static inline void acpi_cmos_rtc_init(void) {}
+ #endif
  
 +extern bool acpi_force_hot_remove;
 +
  void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
  				    const char *name);
  int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,
diff --cc drivers/acpi/scan.c
index e0db2dc42370,a514be216440..dfe76f17cfc4
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -2129,12 -2038,11 +2129,13 @@@ int __init acpi_scan_init(void
  
  	acpi_pci_root_init();
  	acpi_pci_link_init();
 +	acpi_processor_init();
  	acpi_platform_init();
  	acpi_lpss_init();
+ 	acpi_cmos_rtc_init();
  	acpi_container_init();
  	acpi_memory_hotplug_init();
 +	acpi_dock_init();
  
  	mutex_lock(&acpi_scan_lock);
  	/*