aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/container.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 14:59:07 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 14:59:07 -0700
commitadb2705a89e8b41abcf29c0ed86f4ce93ab36734 (patch)
tree01d772570d58cce24b61874e711fd9f51e2729e7 /drivers/acpi/container.c
parent[PATCH] Tweak idle thread setup semantics (diff)
parentMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff)
downloadlinux-dev-adb2705a89e8b41abcf29c0ed86f4ce93ab36734.tar.xz
linux-dev-adb2705a89e8b41abcf29c0ed86f4ce93ab36734.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/acpi/container.c')
-rw-r--r--drivers/acpi/container.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 5a0adbf8bc04..97013ddfa202 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -153,7 +153,7 @@ container_device_add(struct acpi_device **device, acpi_handle handle)
return_VALUE(-ENODEV);
}
- result = acpi_bus_scan(*device);
+ result = acpi_bus_start(*device);
return_VALUE(result);
}