diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /drivers/acpi/container.c | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-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 | } |