Pull cpu-hotplug into release branch

61fb46c5 · Len Brown · 59f720eb · eefa27a9 · 61fb46c5
Commit 61fb46c5 authored Jun 15, 2006 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

drivers/acpi/scan.c drivers/acpi/scan.c +1 -4

No files found.
--- 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);