aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 15:35:15 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 15:35:15 -0400
commit61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 (patch)
treedd1772adc6c3bd5cd73467009b586fe9d53396da
parent59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 (diff)
parenteefa27a93a0490902f33837ac86dbcf344b3aa29 (diff)
Pull cpu-hotplug into release branch
-rw-r--r--drivers/acpi/scan.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index a0ab828b2cc..95d5bc2acad 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);