diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:50 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:50 -0400 |
| commit | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (patch) | |
| tree | f5978cfdc2b5ede82445de6675301a0171e66ea0 /include | |
| parent | aa58329fc8ec50b379388fcad55f62c3493730d3 (diff) | |
| parent | 383d7a11c9989205db44c7f1be339e5097062f03 (diff) | |
Merge branch 'bugfixes' into test
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index e5f38e5ce86f..efbaa271ee11 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
| @@ -93,6 +93,7 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state); | |||
| 93 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); | 93 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); |
| 94 | int acpi_power_get_inferred_state(struct acpi_device *device); | 94 | int acpi_power_get_inferred_state(struct acpi_device *device); |
| 95 | int acpi_power_transition(struct acpi_device *device, int state); | 95 | int acpi_power_transition(struct acpi_device *device, int state); |
| 96 | extern int acpi_power_nocheck; | ||
| 96 | #endif | 97 | #endif |
| 97 | 98 | ||
| 98 | /* -------------------------------------------------------------------------- | 99 | /* -------------------------------------------------------------------------- |