diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 17:59:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 17:59:07 -0400 |
| commit | adb2705a89e8b41abcf29c0ed86f4ce93ab36734 (patch) | |
| tree | 01d772570d58cce24b61874e711fd9f51e2729e7 /drivers/acpi/container.c | |
| parent | f340c0d1a3f40fdcba69cd291530a4debc58748f (diff) | |
| parent | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (diff) | |
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.c | 2 |
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) | |||
| 153 | return_VALUE(-ENODEV); | 153 | return_VALUE(-ENODEV); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | result = acpi_bus_scan(*device); | 156 | result = acpi_bus_start(*device); |
| 157 | 157 | ||
| 158 | return_VALUE(result); | 158 | return_VALUE(result); |
| 159 | } | 159 | } |