Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / acpi / processor_core.c

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index f4778747e889bd6dae32f77287b3580a042081b1..76156ac91bd36b49b62a7232b48432254e71be50 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -723,7 +723,7 @@ int acpi_processor_device_add(
                return_VALUE(-ENODEV);
        }
 
-       acpi_bus_scan(*device);
+       acpi_bus_start(*device);
 
        pr = acpi_driver_data(*device);
        if (!pr)