diff --git a/[refs] b/[refs] index 292517bcdab6..f437274f618f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbe3d8942e8fd1e947e4d11a3e9e15675a1cac7e +refs/heads/master: 2adb8bd380314feb8170d58b3852cad2c374d20f diff --git a/trunk/drivers/platform/x86/eeepc-laptop.c b/trunk/drivers/platform/x86/eeepc-laptop.c index 7dde47a67997..f5efe8da5e7a 100644 --- a/trunk/drivers/platform/x86/eeepc-laptop.c +++ b/trunk/drivers/platform/x86/eeepc-laptop.c @@ -1359,8 +1359,6 @@ static int __init eeepc_laptop_init(void) { int result; - if (acpi_disabled) - return -ENODEV; result = acpi_bus_register_driver(&eeepc_hotk_driver); if (result < 0) return result;