Commit 4d8316d5 authored Aug 14, 2006 by Pavel Machek Committed by Len Brown Aug 15, 2006

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>

parent 0ee6a173

drivers/acpi/ac.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

drivers/acpi/battery.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;