Commit 392798a1 authored Jul 18, 2008 by Thomas Gleixner Committed by Linus Torvalds Jul 20, 2008

APCI: revert duplicated patch



commit 816c2eda ("dock: bay: Don't call
acpi_walk_namespace() when ACPI is disabled.") was merged between
2.6.26-rc8 and -rc9)

Due to rebasing the ACPI tree via quilt the same patch got applied again
via commit cc7e5166 ("dock: bay: Don't
call acpi_walk_namespace() when ACPI is disabled.")

Revert it, as it is obviously bogus.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4e4f64da

drivers/acpi/bay.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -377,9 +377,6 @@ static int __init bay_init(void)

		INIT_LIST_HEAD(&drive_bays);

		if (acpi_disabled)
		return -ENODEV;

		if (acpi_disabled)
		return -ENODEV;

drivers/acpi/dock.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -917,9 +917,6 @@ static int __init dock_init(void)

		dock_station = NULL;

		if (acpi_disabled)
		return 0;

		if (acpi_disabled)
		return 0;