diff options
| author | Luming Yu <luming.yu@intel.com> | 2005-03-18 18:03:45 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-11 23:27:04 -0400 |
| commit | fb9802fa59b196d7f90bb3c2e33c555c6bdc4c54 (patch) | |
| tree | aca6fd906629c6da124a73b43e6f6c50f81b90b4 /drivers/acpi/ibm_acpi.c | |
| parent | d58da590451cf6ae75379a2ebf96d3afb8d810d8 (diff) | |
| download | talos-obmc-linux-fb9802fa59b196d7f90bb3c2e33c555c6bdc4c54.tar.gz talos-obmc-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/ibm_acpi.c')
| -rw-r--r-- | drivers/acpi/ibm_acpi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c index 0fb731a470dc..6c8291c3e774 100644 --- a/drivers/acpi/ibm_acpi.c +++ b/drivers/acpi/ibm_acpi.c @@ -1185,6 +1185,10 @@ static int __init acpi_ibm_init(void) if (acpi_disabled) return -ENODEV; + if (!acpi_specific_hotkey_enabled){ + printk(IBM_ERR "Using generic hotkey driver\n"); + return -ENODEV; + } /* these handles are required */ if (IBM_HANDLE_INIT(ec, 1) < 0 || IBM_HANDLE_INIT(hkey, 1) < 0 || |
