diff --git a/[refs] b/[refs] index 028ce74011a0..e4ab882e4c6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d5db0be4ce36b265f9ddd8debab40acd8580403 +refs/heads/master: b7fab7a0703a9d3a3b4b59aa2f7b098b2b83b8fe diff --git a/trunk/drivers/platform/x86/asus-laptop.c b/trunk/drivers/platform/x86/asus-laptop.c index 8af43e9b6183..4234edbe6ffc 100644 --- a/trunk/drivers/platform/x86/asus-laptop.c +++ b/trunk/drivers/platform/x86/asus-laptop.c @@ -1438,9 +1438,6 @@ static int __init asus_laptop_init(void) { int result; - if (acpi_disabled) - return -ENODEV; - result = acpi_bus_register_driver(&asus_hotk_driver); if (result < 0) return result;