From 90ea1e2c9b3d300fc1e4ac72b6a4b842b3b2a181 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Thu, 26 Jun 2008 01:56:35 -0400
Subject: [PATCH] --- yaml --- r: 98468 b: refs/heads/master c:
 c4e6a2e64e948de42473e9c829181d768b1258c3 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/bay.c  | 3 +++
 trunk/drivers/acpi/dock.c | 3 +++
 trunk/drivers/acpi/glue.c | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 56b004b34ad4..c80cf0c6cc68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16d752397301b95abaa95cbaf9e785d221872311
+refs/heads/master: c4e6a2e64e948de42473e9c829181d768b1258c3
diff --git a/trunk/drivers/acpi/bay.c b/trunk/drivers/acpi/bay.c
index 26038c2a2a71..61b6c5beb2d3 100644
--- a/trunk/drivers/acpi/bay.c
+++ b/trunk/drivers/acpi/bay.c
@@ -377,6 +377,9 @@ static int __init bay_init(void)
 
 	INIT_LIST_HEAD(&drive_bays);
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	/* look for dockable drive bays */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 		ACPI_UINT32_MAX, find_bay, &bays, NULL);
diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c
index 96c542f7fded..bb7c51f712bd 100644
--- a/trunk/drivers/acpi/dock.c
+++ b/trunk/drivers/acpi/dock.c
@@ -917,6 +917,9 @@ static int __init dock_init(void)
 
 	dock_station = NULL;
 
+	if (acpi_disabled)
+		return 0;
+
 	/* look for a dock station */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 			    ACPI_UINT32_MAX, find_dock, &num, NULL);
diff --git a/trunk/drivers/acpi/glue.c b/trunk/drivers/acpi/glue.c
index 2808dc60fd67..9b227d4dc9c9 100644
--- a/trunk/drivers/acpi/glue.c
+++ b/trunk/drivers/acpi/glue.c
@@ -333,6 +333,9 @@ static int __init acpi_rtc_init(void)
 {
 	struct device *dev = get_rtc_dev();
 
+	if (acpi_disabled)
+		return 0;
+
 	if (dev) {
 		rtc_wake_setup();
 		rtc_info.wake_on = rtc_wake_on;