Merge branch 'acpi-scan' into acpi-pm

The following commits depend on the 'acpi-scan' material.
This commit is contained in:
Rafael J. Wysocki
2013-01-17 14:10:27 +01:00
19 changed files with 289 additions and 573 deletions

View File

@@ -353,7 +353,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
* acpi_dev_pm_get_node - Get ACPI device node for the given physical device.
* @dev: Device to get the ACPI node for.
*/
static struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
{
acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
struct acpi_device *adev;