diff options
author | Len Brown <len.brown@intel.com> | 2005-07-12 23:21:56 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-12 23:21:56 +0200 |
commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
tree | 74800e35129775413c13ce7caf036ca19e3ce56c /include/acpi/acpi_drivers.h | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
parent | [ACPI] increase MAX_IO_APICS to 64 on i386 (diff) | |
download | linux-5028770a42e7bc4d15791a44c28f0ad539323807.tar.xz linux-5028770a42e7bc4d15791a44c28f0ad539323807.zip |
[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); int acpi_processor_set_thermal_limit(acpi_handle handle, int type); +/* -------------------------------------------------------------------------- + Hot Keys + -------------------------------------------------------------------------- */ + +extern int acpi_specific_hotkey_enabled; #endif /*__ACPI_DRIVERS_H__*/ |