From eee2893c7be5428df3adf55ba43d557001b84f66 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Fri, 18 Jul 2008 01:43:08 +0200
Subject: [PATCH] --- yaml --- r: 105664 b: refs/heads/master c:
 e1469c34eb623cd1945ef09bfd7de7bc2f9ff6b3 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/bay.c  | 3 ---
 trunk/drivers/acpi/dock.c | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d36d42f114ff..c1dab52d25b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1d77fae0c429d1be84ca0c9e627d9ab0e2a6d0b
+refs/heads/master: e1469c34eb623cd1945ef09bfd7de7bc2f9ff6b3
diff --git a/trunk/drivers/acpi/bay.c b/trunk/drivers/acpi/bay.c
index e6caf5d42e0e..61b6c5beb2d3 100644
--- a/trunk/drivers/acpi/bay.c
+++ b/trunk/drivers/acpi/bay.c
@@ -377,9 +377,6 @@ static int __init bay_init(void)
 
 	INIT_LIST_HEAD(&drive_bays);
 
-	if (acpi_disabled)
-		return -ENODEV;
-
 	if (acpi_disabled)
 		return -ENODEV;
 
diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c
index 1e872e79db33..bb7c51f712bd 100644
--- a/trunk/drivers/acpi/dock.c
+++ b/trunk/drivers/acpi/dock.c
@@ -917,9 +917,6 @@ static int __init dock_init(void)
 
 	dock_station = NULL;
 
-	if (acpi_disabled)
-		return 0;
-
 	if (acpi_disabled)
 		return 0;