From 81aa5ee1f75584af4220506020606551906020c8 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 18 Jul 2008 01:11:38 +0200
Subject: [PATCH] --- yaml --- r: 102379 b: refs/heads/master c:
 392798a17b6afba5928bc577aeb7bc83a1585534 h: refs/heads/master i:   102377:
 f826b04084eb58ff52d588e49c96c7db3638ae14   102375:
 1ac73b9e59c1ec5634ec317a54a51e8777ded897 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 581980712b8d..ed8520b57a57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e4f64da58bc71a139722bb5013adda0f7ca4e78
+refs/heads/master: 392798a17b6afba5928bc577aeb7bc83a1585534
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;