diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-30 16:21:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 16:21:26 -0400 |
| commit | ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d (patch) | |
| tree | 67e4709b760582bdca00e596a2ea68bafb4ccc09 /include | |
| parent | 73f05330497b98c45d157b7d0c60673798bb4c3b (diff) | |
| parent | b24e5098853653554baf6ec975b9e855f3d6e5c0 (diff) | |
| download | linux-stable-ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d.tar.gz linux-stable-ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d.tar.bz2 linux-stable-ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d.zip | |
Merge branch 'd3' into release
Conflicts:
drivers/acpi/sleep.c
This was a text conflict between
a2ef5c4fd44ce3922435139393b89f2cce47f576
(ACPI: Move module parameter gts and bfs to sleep.c)
which added #include <linux/module.h>
and
b24e5098853653554baf6ec975b9e855f3d6e5c0
(ACPI, PCI: Move acpi_dev_run_wake() to ACPI core)
which added #include <linux/pm_runtime.h>
The resolution was to take them both.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 6cd5b6403a7b..f1c8ca60e824 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -323,6 +323,8 @@ int acpi_bus_set_power(acpi_handle handle, int state); int acpi_bus_update_power(acpi_handle handle, int *state_p); bool acpi_bus_power_manageable(acpi_handle handle); bool acpi_bus_can_wakeup(acpi_handle handle); +int acpi_power_resource_register_device(struct device *dev, acpi_handle handle); +void acpi_power_resource_unregister_device(struct device *dev, acpi_handle handle); #ifdef CONFIG_ACPI_PROC_EVENT int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data); int acpi_bus_generate_proc_event4(const char *class, const char *bid, u8 type, int data); @@ -392,8 +394,13 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p) #endif #ifdef CONFIG_PM_SLEEP +int acpi_pm_device_run_wake(struct device *, bool); int acpi_pm_device_sleep_wake(struct device *, bool); #else +static inline int acpi_pm_device_run_wake(struct device *dev, bool enable) +{ + return -ENODEV; +} static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) { return -ENODEV; |