Skip to content

Commit b000de5

Browse files
andy-shevIngo Molnar
authored andcommitted
x86/platform/intel-mid: Join string and fix SoC name
Join string back to make grepping a bit easier. While here, lowering case for Penwell SoC name in one case to be aligned with the rest messages. Signed-off-by: Andy Shevchenko <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Mika Westerberg <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/1452888668-147116-2-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar <[email protected]>
1 parent 3fda5bb commit b000de5

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

arch/x86/platform/intel-mid/intel-mid.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static void intel_mid_arch_setup(void)
138138
intel_mid_ops = get_intel_mid_ops[__intel_mid_cpu_chip]();
139139
else {
140140
intel_mid_ops = get_intel_mid_ops[INTEL_MID_CPU_CHIP_PENWELL]();
141-
pr_info("ARCH: Unknown SoC, assuming PENWELL!\n");
141+
pr_info("ARCH: Unknown SoC, assuming Penwell!\n");
142142
}
143143

144144
out:
@@ -214,12 +214,10 @@ static inline int __init setup_x86_intel_mid_timer(char *arg)
214214
else if (strcmp("lapic_and_apbt", arg) == 0)
215215
intel_mid_timer_options = INTEL_MID_TIMER_LAPIC_APBT;
216216
else {
217-
pr_warn("X86 INTEL_MID timer option %s not recognised"
218-
" use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n",
219-
arg);
217+
pr_warn("X86 INTEL_MID timer option %s not recognised use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n",
218+
arg);
220219
return -EINVAL;
221220
}
222221
return 0;
223222
}
224223
__setup("x86_intel_mid_timer=", setup_x86_intel_mid_timer);
225-

0 commit comments

Comments
 (0)