diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 18fd41033e0..01e2925523e 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -396,6 +396,7 @@ struct acpi_pci_root { | |||
396 | 396 | ||
397 | u32 osc_support_set; /* _OSC state of support bits */ | 397 | u32 osc_support_set; /* _OSC state of support bits */ |
398 | u32 osc_control_set; /* _OSC state of control bits */ | 398 | u32 osc_control_set; /* _OSC state of control bits */ |
399 | phys_addr_t mcfg_addr; | ||
399 | }; | 400 | }; |
400 | 401 | ||
401 | /* helper */ | 402 | /* helper */ |
@@ -409,13 +410,13 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); | |||
409 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); | 410 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); |
410 | 411 | ||
411 | #ifdef CONFIG_PM | 412 | #ifdef CONFIG_PM |
412 | int acpi_pm_device_sleep_state(struct device *, int *); | 413 | int acpi_pm_device_sleep_state(struct device *, int *, int); |
413 | #else | 414 | #else |
414 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p) | 415 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) |
415 | { | 416 | { |
416 | if (p) | 417 | if (p) |
417 | *p = ACPI_STATE_D0; | 418 | *p = ACPI_STATE_D0; |
418 | return ACPI_STATE_D3; | 419 | return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0; |
419 | } | 420 | } |
420 | #endif | 421 | #endif |
421 | 422 | ||