diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:17:03 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:17:03 -0500 |
| commit | 547f7847472c097a54adf38e6576f95ab512e27c (patch) | |
| tree | f52a5cc4ce033d50b161506bf1b7d929f301dde2 /drivers/acpi/scan.c | |
| parent | f398778aa336a2919ee04ba45d915007230c6957 (diff) | |
| parent | 5b53ed69158eeff115004f246193d07a083445f6 (diff) | |
Merge branch 'processor-256' into release
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 71124b9a7073..bd5253ee5c85 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -1013,7 +1013,7 @@ static void acpi_device_set_id(struct acpi_device *device, | |||
| 1013 | hid = ACPI_POWER_HID; | 1013 | hid = ACPI_POWER_HID; |
| 1014 | break; | 1014 | break; |
| 1015 | case ACPI_BUS_TYPE_PROCESSOR: | 1015 | case ACPI_BUS_TYPE_PROCESSOR: |
| 1016 | hid = ACPI_PROCESSOR_HID; | 1016 | hid = ACPI_PROCESSOR_OBJECT_HID; |
| 1017 | break; | 1017 | break; |
| 1018 | case ACPI_BUS_TYPE_SYSTEM: | 1018 | case ACPI_BUS_TYPE_SYSTEM: |
| 1019 | hid = ACPI_SYSTEM_HID; | 1019 | hid = ACPI_SYSTEM_HID; |