git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'samsung-dt-4.21-2' of https://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
kernel
/
setup_64.c
diff --git
a/arch/sparc/kernel/setup_64.c
b/arch/sparc/kernel/setup_64.c
index cd2825cb84207c16b3cf82870a25877a5793ffee..ecc788aa07bdec63554295cfc3e957b3c524c17b 100644
(file)
--- a/
arch/sparc/kernel/setup_64.c
+++ b/
arch/sparc/kernel/setup_64.c
@@
-642,9
+642,9
@@
void __init setup_arch(char **cmdline_p)
register_console(&prom_early_console);
if (tlb_type == hypervisor)
- pr
intk
("ARCH: SUN4V\n");
+ pr
_info
("ARCH: SUN4V\n");
else
- pr
intk
("ARCH: SUN4U\n");
+ pr
_info
("ARCH: SUN4U\n");
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;