diff options
| author | Luming Yu <luming.yu@intel.com> | 2005-03-19 00:03:45 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 05:27:04 +0200 |
| commit | fb9802fa59b196d7f90bb3c2e33c555c6bdc4c54 (patch) | |
| tree | aca6fd906629c6da124a73b43e6f6c50f81b90b4 /drivers/acpi/toshiba_acpi.c | |
| parent | [ACPI] S3 Suspend to RAM: fix driver suspend/resume methods (diff) | |
| download | linux-fb9802fa59b196d7f90bb3c2e33c555c6bdc4c54.tar.xz linux-fb9802fa59b196d7f90bb3c2e33c555c6bdc4c54.zip | |
[ACPI] generic Hot Key support
See Documentation/acpi-hotkey.txt
Use cmdline "acpi_specific_hotkey" to enable
legacy platform specific drivers.
http://bugzilla.kernel.org/show_bug.cgi?id=3887
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/toshiba_acpi.c')
| -rw-r--r-- | drivers/acpi/toshiba_acpi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c index c84997c9f964..bed8e53a5ee8 100644 --- a/drivers/acpi/toshiba_acpi.c +++ b/drivers/acpi/toshiba_acpi.c @@ -529,6 +529,11 @@ toshiba_acpi_init(void) if (acpi_disabled) return -ENODEV; + + if (!acpi_specific_hotkey_enabled){ + printk(MY_INFO "Using generic hotkey driver\n"); + return -ENODEV; + } /* simple device detection: look for HCI method */ if (is_valid_acpi_path(METHOD_HCI_1)) method_hci = METHOD_HCI_1; |