diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-17 04:11:02 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-17 04:11:02 +0100 |
| commit | 8800c0ebf5e8363dab66647512dcef5b83203dec (patch) | |
| tree | 2576b0ab6177554409ab7e62fb411c6b5487d64d /drivers/acpi/asus_acpi.c | |
| parent | Pull sony into release branch (diff) | |
| parent | ACPI: hotkey: remove driver, per feature-removal-schedule.txt (diff) | |
| download | linux-8800c0ebf5e8363dab66647512dcef5b83203dec.tar.xz linux-8800c0ebf5e8363dab66647512dcef5b83203dec.zip | |
Pull remove-hotkey into release branch
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
| -rw-r--r-- | drivers/acpi/asus_acpi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 84de0887a0da..772299fb5f9d 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -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"); |