diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/acpi/container.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
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 | } |