projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
misc
/
asus-laptop.c
diff --git
a/drivers/misc/asus-laptop.c
b/drivers/misc/asus-laptop.c
index 861c39935f99f7127e48a6d15527e412343f6e28..e4e2b707a3531f0ae8371ac7f730ce27917f65ee 100644
(file)
--- 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;