diff options
author | Akira Takeuchi <takeuchi.akr@jp.panasonic.com> | 2010-10-27 12:29:00 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2010-10-27 12:29:00 -0400 |
commit | a5e03ca2fd57a5823b759981bff8d19b46ddad4d (patch) | |
tree | 0e35b98f3561f7ffab72258e4f618e2a80478a84 /arch/mn10300 | |
parent | 72d36faffbe2f12233026118e169fc1a10c6cb8e (diff) |
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/Kconfig | 4 | ||||
-rw-r--r-- | arch/mn10300/kernel/setup.c | 4 | ||||
-rw-r--r-- | 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 129ca492e91..365766a3d53 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
@@ -93,14 +93,14 @@ config GENERIC_HARDIRQS | |||
93 | config HOTPLUG_CPU | 93 | config HOTPLUG_CPU |
94 | def_bool n | 94 | def_bool n |
95 | 95 | ||
96 | mainmenu "Matsushita MN10300/AM33 Kernel Configuration" | 96 | mainmenu "Panasonic MN10300/AM33 Kernel Configuration" |
97 | 97 | ||
98 | source "init/Kconfig" | 98 | source "init/Kconfig" |
99 | 99 | ||
100 | source "kernel/Kconfig.freezer" | 100 | source "kernel/Kconfig.freezer" |
101 | 101 | ||
102 | 102 | ||
103 | menu "Matsushita MN10300 system setup" | 103 | menu "Panasonic MN10300 system setup" |
104 | 104 | ||
105 | choice | 105 | choice |
106 | prompt "Unit type" | 106 | 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) | |||
187 | if (type > mn10300_known_cpus) | 187 | if (type > mn10300_known_cpus) |
188 | type = mn10300_known_cpus; | 188 | type = mn10300_known_cpus; |
189 | 189 | ||
190 | printk(KERN_INFO "Matsushita %s, rev %ld\n", | 190 | printk(KERN_INFO "Panasonic %s, rev %ld\n", |
191 | mn10300_cputypes[type], | 191 | mn10300_cputypes[type], |
192 | (cpurev & CPUREV_REVISION) >> CPUREV_REVISION_S); | 192 | (cpurev & CPUREV_REVISION) >> CPUREV_REVISION_S); |
193 | 193 | ||
@@ -246,7 +246,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
246 | 246 | ||
247 | seq_printf(m, | 247 | seq_printf(m, |
248 | "processor : %ld\n" | 248 | "processor : %ld\n" |
249 | "vendor_id : Matsushita\n" | 249 | "vendor_id : " PROCESSOR_VENDOR_NAME "\n" |
250 | "cpu core : %s\n" | 250 | "cpu core : %s\n" |
251 | "cpu rev : %lu\n" | 251 | "cpu rev : %lu\n" |
252 | "model name : " PROCESSOR_MODEL_NAME "\n" | 252 | "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 @@ | |||
12 | #ifndef _ASM_PROC_PROC_H | 12 | #ifndef _ASM_PROC_PROC_H |
13 | #define _ASM_PROC_PROC_H | 13 | #define _ASM_PROC_PROC_H |
14 | 14 | ||
15 | #define PROCESSOR_VENDOR_NAME "Matsushita" | 15 | #define PROCESSOR_VENDOR_NAME "Panasonic" |
16 | #define PROCESSOR_MODEL_NAME "mn103e010" | 16 | #define PROCESSOR_MODEL_NAME "mn103e010" |
17 | 17 | ||
18 | #endif /* _ASM_PROC_PROC_H */ | 18 | #endif /* _ASM_PROC_PROC_H */ |