diff options
| author |   Len Brown <len.brown@intel.com> | 2006-06-15 15:35:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:35:15 -0400 |
| commit | 61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 (patch) | |
| tree | dd1772adc6c3bd5cd73467009b586fe9d53396da /drivers/acpi | |
| parent | Pull address_range into release branch (diff) | |
| parent | ACPI: Allow hot-add of ejected processor (diff) | |
| download | linux-dev-61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143.tar.xz linux-dev-61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143.zip | |
Pull cpu-hotplug into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index a0ab828b2cc5..95d5bc2acadd 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -441,10 +441,7 @@ acpi_eject_store(struct acpi_device *device, const char *buf, size_t count) 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); |