diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-26 03:36:44 +0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-26 03:36:44 +0400 |
commit | cc38e519132f62d52db0a04d2eaed0d7c52fb165 (patch) | |
tree | 35baaba355d6fbc1d43e9ca12278156f3eeab910 /drivers/acpi/device_pm.c | |
parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
parent | b8bd759acd05281abf88cddef30c57313c109697 (diff) | |
download | linux-cc38e519132f62d52db0a04d2eaed0d7c52fb165.tar.xz |
Merge branch 'acpi-scan' into acpi-cleanup
The following commits depend on the 'acpi-scan' material.
Diffstat (limited to 'drivers/acpi/device_pm.c')
-rw-r--r-- | drivers/acpi/device_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index c6ff606c6d5b..995019063f64 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -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; |