From ce11c570438a7bf28cc8ff51ed4968a834555424 Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Thu, 3 Dec 2009 07:44:48 +0000
Subject: [PATCH] --- yaml --- r: 177493 b: refs/heads/master c:
 b7fab7a0703a9d3a3b4b59aa2f7b098b2b83b8fe h: refs/heads/master i:   177491:
 1945ac610ff6dc326b826da653ab52b2a58fa961 v: v3

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

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;