diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
| commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
| tree | 74800e35129775413c13ce7caf036ca19e3ce56c /include/acpi/acpi_drivers.h | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
| parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) | |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpi_drivers.h')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 4ec722d73381..caeaa71a5663 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
| @@ -109,5 +109,10 @@ int acpi_ec_ecdt_probe (void); | |||
| 109 | 109 | ||
| 110 | int acpi_processor_set_thermal_limit(acpi_handle handle, int type); | 110 | int acpi_processor_set_thermal_limit(acpi_handle handle, int type); |
| 111 | 111 | ||
| 112 | /* -------------------------------------------------------------------------- | ||
| 113 | Hot Keys | ||
| 114 | -------------------------------------------------------------------------- */ | ||
| 115 | |||
| 116 | extern int acpi_specific_hotkey_enabled; | ||
| 112 | 117 | ||
| 113 | #endif /*__ACPI_DRIVERS_H__*/ | 118 | #endif /*__ACPI_DRIVERS_H__*/ |