summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/toshiba_acpi.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 22:11:02 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 22:11:02 -0500
commit8800c0ebf5e8363dab66647512dcef5b83203dec (patch)
tree2576b0ab6177554409ab7e62fb411c6b5487d64d /drivers/acpi/toshiba_acpi.c
parent9cdd79c9b99873d600d397fda012fc3f57cc2776 (diff)
parent5ee6edbcde4d3b14e4e03d4b331df1099a34aa8d (diff)
downloadop-kernel-dev-8800c0ebf5e8363dab66647512dcef5b83203dec.zip
op-kernel-dev-8800c0ebf5e8363dab66647512dcef5b83203dec.tar.gz
Pull remove-hotkey into release branch
Diffstat (limited to 'drivers/acpi/toshiba_acpi.c')
-rw-r--r--drivers/acpi/toshiba_acpi.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 0208d3a..faf8a52 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -561,10 +561,6 @@ static int __init 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;
OpenPOWER on IntegriCloud