Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6

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");