Skip to content

Commit

Permalink
acpi: trivial cleanups
Browse files Browse the repository at this point in the history
Trivial cleanups for ACPI. Fix misspelling in printk(), fix mismerge,
add file header.

AK: removed file header

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
  • Loading branch information
Pavel Machek authored and Andi Kleen committed Aug 15, 2008
1 parent b635ace commit d005741
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/acpi/processor_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ struct acpi_processor_errata errata __read_mostly;
static int set_no_mwait(const struct dmi_system_id *id)
{
printk(KERN_NOTICE PREFIX "%s detected - "
"disable mwait for CPU C-stetes\n", id->ident);
"disabling mwait for CPU C-states\n", id->ident);
idle_nomwait = 1;
return 0;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/acpi/processor_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <linux/pm_qos_params.h>
#include <linux/clockchips.h>
#include <linux/cpuidle.h>
#include <linux/cpuidle.h>

/*
* Include the apic definitions for x86 to have the APIC timer related defines
Expand Down

0 comments on commit d005741

Please sign in to comment.