diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:02 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:02 -0500 |
| commit | 8800c0ebf5e8363dab66647512dcef5b83203dec (patch) | |
| tree | 2576b0ab6177554409ab7e62fb411c6b5487d64d /drivers/misc | |
| parent | 9cdd79c9b99873d600d397fda012fc3f57cc2776 (diff) | |
| parent | 5ee6edbcde4d3b14e4e03d4b331df1099a34aa8d (diff) | |
Pull remove-hotkey into release branch
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/asus-laptop.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index 861c39935f9..e4e2b707a35 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c @@ -1088,11 +1088,6 @@ static int __init asus_laptop_init(void) if (acpi_disabled) return -ENODEV; - if (!acpi_specific_hotkey_enabled) { - printk(ASUS_ERR "Using generic hotkey driver\n"); - return -ENODEV; - } - result = acpi_bus_register_driver(&asus_hotk_driver); if (result < 0) return result; |