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;