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/asus_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/asus_acpi.c')
-rw-r--r-- | drivers/acpi/asus_acpi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index a75cb565caeb..a560b1e2da77 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -1204,6 +1204,10 @@ static int __init asus_acpi_init(void) if (acpi_disabled) return -ENODEV; + if (!acpi_specific_hotkey_enabled){ + printk(KERN_ERR "Using generic hotkey driver\n"); + return -ENODEV; + } asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir); if (!asus_proc_dir) { printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n"); |