Merge branch 'processor-256' into release

This commit is contained in:
Len Brown
2008-11-11 21:17:03 -05:00
3 changed files with 51 additions and 38 deletions

View File

@@ -1013,7 +1013,7 @@ static void acpi_device_set_id(struct acpi_device *device,
hid = ACPI_POWER_HID;
break;
case ACPI_BUS_TYPE_PROCESSOR:
hid = ACPI_PROCESSOR_HID;
hid = ACPI_PROCESSOR_OBJECT_HID;
break;
case ACPI_BUS_TYPE_SYSTEM:
hid = ACPI_SYSTEM_HID;