| commit | 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe | [log] [tgz] |
|---|---|---|
| author | Pavel Machek <pavel@ucw.cz> | Mon Aug 14 22:37:22 2006 -0700 |
| committer | Len Brown <len.brown@intel.com> | Tue Aug 15 23:16:43 2006 -0400 |
| tree | 41fb896080563444bfdf047d56946d775b4f74a6 | |
| parent | 0ee6a17389ceef65f1a86c38872fa98f08489022 [diff] [blame] |
ACPI: fix boot with acpi=off Fix acpi_ac/battery boot with acpi=off Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 96309b9..11abc7b 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c
@@ -285,6 +285,8 @@ { int result; + if (acpi_disabled) + return -ENODEV; acpi_ac_dir = acpi_lock_ac_dir(); if (!acpi_ac_dir)