diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-07-17 19:43:08 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-07-17 19:43:08 -0400 |
| commit | e1469c34eb623cd1945ef09bfd7de7bc2f9ff6b3 (patch) | |
| tree | 62fb8380394a0d43575a21e0e8aee40f0c0c3e89 /drivers/acpi/bay.c | |
| parent | b1d77fae0c429d1be84ca0c9e627d9ab0e2a6d0b (diff) | |
Revert "dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled."
Revert double commit by mistake. Noticed by Thomas Gleixner.
This reverts commit cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers/acpi/bay.c')
| -rw-r--r-- | drivers/acpi/bay.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index e6caf5d42e0e..61b6c5beb2d3 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c | |||
| @@ -380,9 +380,6 @@ static int __init bay_init(void) | |||
| 380 | if (acpi_disabled) | 380 | if (acpi_disabled) |
| 381 | return -ENODEV; | 381 | return -ENODEV; |
| 382 | 382 | ||
| 383 | if (acpi_disabled) | ||
| 384 | return -ENODEV; | ||
| 385 | |||
| 386 | /* look for dockable drive bays */ | 383 | /* look for dockable drive bays */ |
| 387 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, | 384 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, |
| 388 | ACPI_UINT32_MAX, find_bay, &bays, NULL); | 385 | ACPI_UINT32_MAX, find_bay, &bays, NULL); |
