summaryrefslogtreecommitdiff
path: root/drivers/acpi/ibm_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/ibm_acpi.c
parent9cdd79c9b99873d600d397fda012fc3f57cc2776 (diff)
parent5ee6edbcde4d3b14e4e03d4b331df1099a34aa8d (diff)
Pull remove-hotkey into release branch
Diffstat (limited to 'drivers/acpi/ibm_acpi.c')
-rw-r--r--drivers/acpi/ibm_acpi.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 2429e1180fa9..1a0ed3dc409c 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -2701,11 +2701,6 @@ static int __init acpi_ibm_init(void)
if (acpi_disabled)
return -ENODEV;
- if (!acpi_specific_hotkey_enabled) {
- printk(IBM_ERR "using generic hotkey driver\n");
- return -ENODEV;
- }
-
/* ec is required because many other handles are relative to it */
IBM_HANDLE_INIT(ec);
if (!ec_handle) {