diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:02 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:02 -0500 |
| commit | 8800c0ebf5e8363dab66647512dcef5b83203dec (patch) | |
| tree | 2576b0ab6177554409ab7e62fb411c6b5487d64d /include/acpi | |
| parent | 9cdd79c9b99873d600d397fda012fc3f57cc2776 (diff) | |
| parent | 5ee6edbcde4d3b14e4e03d4b331df1099a34aa8d (diff) | |
Pull remove-hotkey into release branch
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 3d7ebe0e4fc2..07a5eb036e96 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
| @@ -105,12 +105,6 @@ int acpi_ec_ecdt_probe(void); | |||
| 105 | 105 | ||
| 106 | int acpi_processor_set_thermal_limit(acpi_handle handle, int type); | 106 | int acpi_processor_set_thermal_limit(acpi_handle handle, int type); |
| 107 | 107 | ||
| 108 | /* -------------------------------------------------------------------------- | ||
| 109 | Hot Keys | ||
| 110 | -------------------------------------------------------------------------- */ | ||
| 111 | |||
| 112 | extern int acpi_specific_hotkey_enabled; | ||
| 113 | |||
| 114 | /*-------------------------------------------------------------------------- | 108 | /*-------------------------------------------------------------------------- |
| 115 | Dock Station | 109 | Dock Station |
| 116 | -------------------------------------------------------------------------- */ | 110 | -------------------------------------------------------------------------- */ |