diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:10:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:10:27 +0100 |
| commit | 6a8dd80821c215bc49bf6b108e85c1738c82bf43 (patch) | |
| tree | 3c8a42ca07fd69f9e11e0093e9eb041cad82c1c6 /drivers/acpi/device_pm.c | |
| parent | Linux 3.8-rc3 (diff) | |
| parent | ACPI: update ej_event interface to take acpi_device (diff) | |
| download | linux-6a8dd80821c215bc49bf6b108e85c1738c82bf43.tar.xz linux-6a8dd80821c215bc49bf6b108e85c1738c82bf43.zip | |
Merge branch 'acpi-scan' into acpi-pm
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; |