aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2008-07-18 01:43:08 +0200
committerAndi Kleen <ak@linux.intel.com>2008-07-18 01:43:08 +0200
commite1469c34eb623cd1945ef09bfd7de7bc2f9ff6b3 (patch)
tree62fb8380394a0d43575a21e0e8aee40f0c0c3e89 /drivers/acpi
parentb1d77fae0c429d1be84ca0c9e627d9ab0e2a6d0b (diff)
downloadkernel_samsung_smdk4412-e1469c34eb623cd1945ef09bfd7de7bc2f9ff6b3.zip
kernel_samsung_smdk4412-e1469c34eb623cd1945ef09bfd7de7bc2f9ff6b3.tar.gz
kernel_samsung_smdk4412-e1469c34eb623cd1945ef09bfd7de7bc2f9ff6b3.tar.bz2
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')
-rw-r--r--drivers/acpi/bay.c3
-rw-r--r--drivers/acpi/dock.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index e6caf5d..61b6c5b 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -380,9 +380,6 @@ static int __init bay_init(void)
if (acpi_disabled)
return -ENODEV;
- if (acpi_disabled)
- return -ENODEV;
-
/* look for dockable drive bays */
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, find_bay, &bays, NULL);
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 1e872e7..bb7c51f 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -920,9 +920,6 @@ static int __init dock_init(void)
if (acpi_disabled)
return 0;
- if (acpi_disabled)
- return 0;
-
/* look for a dock station */
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, find_dock, &num, NULL);