diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
| commit | 02e2407858fd62053bf60349c0e72cd1c7a4a60e (patch) | |
| tree | 0ebdbddc97d3abbc675916010e7771065b70c137 /include/acpi | |
| parent | 96e1c408ea8a556c5b51e0e7d56bd2afbfbf5fe9 (diff) | |
| parent | 6447f55da90b77faec1697d499ed7986bb4f6de6 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index f50ebb9bc53b..3a10ef5914eb 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -380,7 +380,7 @@ struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); | |||
| 380 | int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); | 380 | int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); |
| 381 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); | 381 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); |
| 382 | 382 | ||
| 383 | #ifdef CONFIG_PM_OPS | 383 | #ifdef CONFIG_PM |
| 384 | int acpi_pm_device_sleep_state(struct device *, int *); | 384 | int acpi_pm_device_sleep_state(struct device *, int *); |
| 385 | #else | 385 | #else |
| 386 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p) | 386 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p) |