From aa551504f84a7b51a437f21d7a1bfd6e1f6392ef Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Thu, 3 Dec 2009 07:44:54 +0000
Subject: [PATCH] --- yaml --- r: 177499 b: refs/heads/master c:
 2adb8bd380314feb8170d58b3852cad2c374d20f h: refs/heads/master i:   177497:
 bb870d7d5c9950da848e493fef6ce554f3b9c172   177495:
 1c6bb0ed9acf203ed01005cabda1c6650d5a9995 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/platform/x86/eeepc-laptop.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

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;