diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 05:19:50 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 05:19:50 +0200 |
| commit | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (patch) | |
| tree | f5978cfdc2b5ede82445de6675301a0171e66ea0 /include/acpi | |
| parent | Merge branch 'acer-wmi' into test (diff) | |
| parent | ACPI: Fix possible null ptr dereference (diff) | |
| download | linux-955ba395616a78780e70dc3f3b0b56ca4db52e5c.tar.xz linux-955ba395616a78780e70dc3f3b0b56ca4db52e5c.zip | |
Merge branch 'bugfixes' into test
Diffstat (limited to 'include/acpi')
| -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); int acpi_disable_wakeup_device_power(struct acpi_device *dev); int acpi_power_get_inferred_state(struct acpi_device *device); int acpi_power_transition(struct acpi_device *device, int state); +extern int acpi_power_nocheck; #endif /* -------------------------------------------------------------------------- |