From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 29 Jan 2013 12:59:00 +0000 (+0100)
Subject: Merge branch 'acpi-lpss' into acpi-cleanup
X-Git-Tag: firefly_0821_release~3680^2~1034^2~1^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b4e2fa4ff72ba2c9f01af8def15d4c4eeeeed64;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-lpss' into acpi-cleanup

The following commits depend on the 'acpi-lpss' material.
---

8b4e2fa4ff72ba2c9f01af8def15d4c4eeeeed64
diff --cc drivers/acpi/scan.c
index 774b17dc7999,fe171aa7a98c..fe9f2c926663
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1725,7 -1699,9 +1727,8 @@@ int __init acpi_scan_init(void
  		printk(KERN_ERR PREFIX "Could not register bus type\n");
  	}
  
 -	acpi_power_init();
  	acpi_pci_root_init();
+ 	acpi_csrt_init();
  
  	/*
  	 * Enumerate devices in the ACPI namespace.