| commit | 61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Thu Jun 15 15:35:15 2006 -0400 |
| committer | Len Brown <len.brown@intel.com> | Thu Jun 15 15:35:15 2006 -0400 |
| tree | dd1772adc6c3bd5cd73467009b586fe9d53396da | |
| parent | 59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 [diff] | |
| parent | eefa27a93a0490902f33837ac86dbcf344b3aa29 [diff] |
Pull cpu-hotplug into release branch
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index a0ab828..95d5bc2 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c
@@ -441,10 +441,7 @@ islockable = device->flags.lockable; handle = device->handle; - if (type == ACPI_TYPE_PROCESSOR) - result = acpi_bus_trim(device, 0); - else - result = acpi_bus_trim(device, 1); + result = acpi_bus_trim(device, 1); if (!result) result = acpi_eject_operation(handle, islockable);