Skip to content

Commit

Permalink
APCI: revert duplicated patch
Browse files Browse the repository at this point in the history
commit 816c2ed ("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 cc7e516 ("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>
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jul 21, 2008
1 parent 4e4f64d commit 392798a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions drivers/acpi/bay.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions drivers/acpi/dock.c
Original file line number Diff line number Diff line change
Expand Up @@ -917,9 +917,6 @@ static int __init dock_init(void)

dock_station = NULL;

if (acpi_disabled)
return 0;

if (acpi_disabled)
return 0;

Expand Down

0 comments on commit 392798a

Please sign in to comment.