From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 11 Feb 2013 12:21:27 +0000 (+0100)
Subject: Merge branch 'acpi-lpss'
X-Git-Tag: v3.9-rc1~146^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=17b1639b30e080dc577cbffe7a08d063708ec789;p=linux.git

Merge branch 'acpi-lpss'

* acpi-lpss:
  ACPI / platform: create LPSS clocks if Lynxpoint devices are found during scan
  clk: x86: add support for Lynxpoint LPSS clocks
  x86: add support for Intel Low Power Subsystem
  ACPI / platform: fix comment about the platform device name
  ACPI: add support for CSRT table
---

17b1639b30e080dc577cbffe7a08d063708ec789
diff --cc drivers/acpi/scan.c
index cbf6e7729c39,fe171aa7a98c..c4358716aadc
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1716,7 -1699,9 +1718,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.