diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:21:47 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:21:47 -0500 |
| commit | e6532b8883760bdf9d251c669a3919fc9457aeca (patch) | |
| tree | a3e00d9adb1d16b7f7286e365d54de44727ae562 /drivers/acpi/processor_core.c | |
| parent | d89a9bda14204547f966ed1510a269a44c0b7f5d (diff) | |
| parent | 4fdb2a05ef5703553fdd28f1b96ebdd79f173657 (diff) | |
Pull fluff into release branch
Conflicts:
drivers/acpi/ec.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/processor_core.c')
| -rw-r--r-- | drivers/acpi/processor_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index e93318bb029e..949ba0395901 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -641,7 +641,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device) */ if (processor_device_array[pr->id] != NULL && processor_device_array[pr->id] != device) { - printk(KERN_WARNING "BIOS reported wrong ACPI id" + printk(KERN_WARNING "BIOS reported wrong ACPI id " "for the processor\n"); return -ENODEV; } |