From 1c481747773a1dd452688a6dcaab4ad7f4defdd7 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Mon, 14 Aug 2006 22:37:22 -0700
Subject: [PATCH] --- yaml --- r: 33417 b: refs/heads/master c:
 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe h: refs/heads/master i:   33415:
 3cfef47ce7d7fcde37eeee5e058d36628a89f4e9 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/acpi/ac.c      | 2 ++
 trunk/drivers/acpi/battery.c | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 459463894d49..9fbb654a3592 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ee6a17389ceef65f1a86c38872fa98f08489022
+refs/heads/master: 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe
diff --git a/trunk/drivers/acpi/ac.c b/trunk/drivers/acpi/ac.c
index 96309b9660da..11abc7bf777e 100644
--- a/trunk/drivers/acpi/ac.c
+++ b/trunk/drivers/acpi/ac.c
@@ -285,6 +285,8 @@ static int __init acpi_ac_init(void)
 {
 	int result;
 
+	if (acpi_disabled)
+		return -ENODEV;
 
 	acpi_ac_dir = acpi_lock_ac_dir();
 	if (!acpi_ac_dir)
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
index 6e5221707d97..9810e2a55d0a 100644
--- a/trunk/drivers/acpi/battery.c
+++ b/trunk/drivers/acpi/battery.c
@@ -757,6 +757,9 @@ static int __init acpi_battery_init(void)
 {
 	int result;
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	acpi_battery_dir = acpi_lock_battery_dir();
 	if (!acpi_battery_dir)
 		return -ENODEV;