projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nios2-v4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
boot
/
mpsc.c
diff --git
a/arch/powerpc/boot/mpsc.c
b/arch/powerpc/boot/mpsc.c
index 802ea53790d8ca7ec4373761fcc8440b17e204f4..425ad88cce8d90a435b22a83876c06b0263716f7 100644
(file)
--- a/
arch/powerpc/boot/mpsc.c
+++ b/
arch/powerpc/boot/mpsc.c
@@
-141,7
+141,7
@@
int mpsc_console_init(void *devp, struct serial_console_data *scdp)
if (mpscintr_base == NULL)
goto err_out;
- n = getprop(devp, "
block
-index", &v, sizeof(v));
+ n = getprop(devp, "
cell
-index", &v, sizeof(v));
if (n != sizeof(v))
goto err_out;
reg_set = (int)v;