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) | |
| download | kernel-crypto-547f7847472c097a54adf38e6576f95ab512e27c.tar.gz kernel-crypto-547f7847472c097a54adf38e6576f95ab512e27c.tar.xz kernel-crypto-547f7847472c097a54adf38e6576f95ab512e27c.zip | |
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 71124b9a707..bd5253ee5c8 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, 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; |