[PATCH 42/43] MN10300: Change "Matsushita" to "Panasonic".

From: David Howells
Date: Mon Oct 25 2010 - 22:57:05 EST


From: Akira Takeuchi <takeuchi.akr@xxxxxxxxxxxxxxxx>

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

Signed-off-by: Akira Takeuchi <takeuchi.akr@xxxxxxxxxxxxxxxx>
Signed-off-by: Kiyoshi Owada <owada.kiyoshi@xxxxxxxxxxxxxxxx>
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
---

arch/mn10300/Kconfig | 4 ++--
arch/mn10300/kernel/setup.c | 4 ++--
arch/mn10300/proc-mn103e010/include/proc/proc.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 129ca49..365766a 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -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"
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c
index 1251457..9e7a320 100644
--- a/arch/mn10300/kernel/setup.c
+++ b/arch/mn10300/kernel/setup.c
@@ -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"
diff --git a/arch/mn10300/proc-mn103e010/include/proc/proc.h b/arch/mn10300/proc-mn103e010/include/proc/proc.h
index 22a2b93..39c4f8e 100644
--- a/arch/mn10300/proc-mn103e010/include/proc/proc.h
+++ b/arch/mn10300/proc-mn103e010/include/proc/proc.h
@@ -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 */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/