---

yaml --- r: 33417 b: refs/heads/master c: 4d8316d h: refs/heads/master i: 33415: 3cfef47 v: v3
git-mirror · Aug 16, 2006 · 1c48174 · 1c48174
1 parent d144ca0
commit 1c48174
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;