aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 15:42:14 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 15:42:14 -0400
commit35a5d9ed9fedb74c22cb19ff7d749289473144e0 (patch)
treec414a1aeac5d4fe6db3a411685ca66e733f71496 /drivers/acpi
parent3e8e7c93d7eb091463839b5212789c4aae09459e (diff)
parent0eacee585a89ce5827b572a73a024931506bef48 (diff)
Pull bugzilla-5452 into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index e5041c4f3c2c..a1b46fb41c80 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -558,8 +558,8 @@ static int acpi_processor_start(struct acpi_device *device)
558 */ 558 */
559 if (processor_device_array[pr->id] != NULL && 559 if (processor_device_array[pr->id] != NULL &&
560 processor_device_array[pr->id] != (void *)device) { 560 processor_device_array[pr->id] != (void *)device) {
561 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting wrong ACPI id" 561 printk(KERN_WARNING "BIOS reported wrong ACPI id"
562 "for the processor\n")); 562 "for the processor\n");
563 return_VALUE(-ENODEV); 563 return_VALUE(-ENODEV);
564 } 564 }
565 processor_device_array[pr->id] = (void *)device; 565 processor_device_array[pr->id] = (void *)device;