Pull cpu-hotplug into release branch

git-mirror · Jun 15, 2006 · 61fb46c · 61fb46c
2 parents 59f720e + eefa27a
commit 61fb46c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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);