]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - drivers/acpi/asus_acpi.c
Pull remove-hotkey into release branch
[linux-2.6.git] / drivers / acpi / asus_acpi.c
index 84de0887a0da067a2b5073d635dc43f8eec388de..772299fb5f9d97e54078f549e8241a852bbf181b 100644 (file)
@@ -1377,10 +1377,6 @@ 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");