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

Commit a5e03ca2 authored by Akira Takeuchi's avatar Akira Takeuchi Committed by David Howells
Browse files

MN10300: Change "Matsushita" to "Panasonic". 



Change externally visible "Matsushita" instances to "Panasonic" throughout the
MN10300 arch code.

Signed-off-by: default avatarAkira Takeuchi <takeuchi.akr@jp.panasonic.com>
Signed-off-by: default avatarKiyoshi Owada <owada.kiyoshi@jp.panasonic.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 72d36faf

arch/mn10300/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -93,14 +93,14 @@ config GENERIC_HARDIRQS 
config HOTPLUG_CPU

	def_bool n



mainmenu "Matsushita MN10300/AM33 Kernel Configuration"

mainmenu "Panasonic MN10300/AM33 Kernel Configuration"



source "init/Kconfig"



source "kernel/Kconfig.freezer"





menu "Matsushita MN10300 system setup"

menu "Panasonic MN10300 system setup"



choice

	prompt "Unit type"

arch/mn10300/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void __init cpu_init(void) 
	if (type > mn10300_known_cpus)

		type = mn10300_known_cpus;



	printk(KERN_INFO "Matsushita %s, rev %ld\n",

	printk(KERN_INFO "Panasonic %s, rev %ld\n",

	       mn10300_cputypes[type],

	       (cpurev & CPUREV_REVISION) >> CPUREV_REVISION_S);
@@ -246,7 +246,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 


	seq_printf(m,

		   "processor  : %ld\n"

		   "vendor_id  : Matsushita\n"

		   "vendor_id  : " PROCESSOR_VENDOR_NAME "\n"

		   "cpu core   : %s\n"

		   "cpu rev    : %lu\n"

		   "model name : " PROCESSOR_MODEL_NAME		"\n"

arch/mn10300/proc-mn103e010/include/proc/proc.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef _ASM_PROC_PROC_H

#define _ASM_PROC_PROC_H



#define PROCESSOR_VENDOR_NAME	"Matsushita"

#define PROCESSOR_VENDOR_NAME	"Panasonic"

#define PROCESSOR_MODEL_NAME	"mn103e010"



#endif /* _ASM_PROC_PROC_H */