aboutsummaryrefslogtreecommitdiff
path: root/arch/mn10300
diff options
context:
space:
mode:
authorAkira Takeuchi <takeuchi.akr@jp.panasonic.com>2010-10-27 17:29:00 +0100
committerDavid Howells <dhowells@redhat.com>2010-10-27 17:29:00 +0100
commita5e03ca2fd57a5823b759981bff8d19b46ddad4d (patch)
tree0e35b98f3561f7ffab72258e4f618e2a80478a84 /arch/mn10300
parent72d36faffbe2f12233026118e169fc1a10c6cb8e (diff)
downloadlinux-2.6.38-lt-ux500-a5e03ca2fd57a5823b759981bff8d19b46ddad4d.tar.gz
MN10300: Change "Matsushita" to "Panasonic".
Change externally visible "Matsushita" instances to "Panasonic" throughout the MN10300 arch code. Signed-off-by: Akira Takeuchi <takeuchi.akr@jp.panasonic.com> Signed-off-by: Kiyoshi Owada <owada.kiyoshi@jp.panasonic.com> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/mn10300')
-rw-r--r--arch/mn10300/Kconfig4
-rw-r--r--arch/mn10300/kernel/setup.c4
-rw-r--r--arch/mn10300/proc-mn103e010/include/proc/proc.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 129ca492e91..365766a3d53 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 12514570ed5..9e7a3209a3e 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 22a2b93f70b..39c4f8e7d2d 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 */