Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b000de58 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1452888668-147116-2-git-send-email-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3fda5bb4

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

+3 −5
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void intel_mid_arch_setup(void) 
		intel_mid_ops = get_intel_mid_ops[__intel_mid_cpu_chip]();

	else {

		intel_mid_ops = get_intel_mid_ops[INTEL_MID_CPU_CHIP_PENWELL]();

		pr_info("ARCH: Unknown SoC, assuming PENWELL!\n");

		pr_info("ARCH: Unknown SoC, assuming Penwell!\n");

	}



out:
@@ -214,12 +214,10 @@ static inline int __init setup_x86_intel_mid_timer(char *arg) 
	else if (strcmp("lapic_and_apbt", arg) == 0)

		intel_mid_timer_options = INTEL_MID_TIMER_LAPIC_APBT;

	else {

		pr_warn("X86 INTEL_MID timer option %s not recognised"

			   " use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n",

		pr_warn("X86 INTEL_MID timer option %s not recognised use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n",

			arg);

		return -EINVAL;

	}

	return 0;

}

__setup("x86_intel_mid_timer=", setup_x86_intel_mid_timer);