diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 15:12:16 (GMT) |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 15:12:16 (GMT) |
commit | c226feb013ce81a18512fb4827bf7c2352d8b470 (patch) | |
tree | 4415ebda1c24f68bd7b88641f64097111eb359e0 /arch/x86/kernel/process.c | |
parent | 32919a28cc8470b1526f77b2f12cca8841b9ac62 (diff) | |
parent | 85ec7b970553369e0c956fab1d7a6022f2a99369 (diff) | |
download | linux-fsl-qoriq-c226feb013ce81a18512fb4827bf7c2352d8b470.tar.xz |
Merge branch 'for_3.0/gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/merge
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r-- | arch/x86/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 426a5b6..2e4928d 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -642,7 +642,7 @@ static int __init idle_setup(char *str) boot_option_idle_override = IDLE_POLL; } else if (!strcmp(str, "mwait")) { boot_option_idle_override = IDLE_FORCE_MWAIT; - WARN_ONCE(1, "\idle=mwait\" will be removed in 2012\"\n"); + WARN_ONCE(1, "\"idle=mwait\" will be removed in 2012\n"); } else if (!strcmp(str, "halt")) { /* * When the boot option of idle=halt is added, halt is |