projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-mxs
/
mach-mxs.c
diff --git
a/arch/arm/mach-mxs/mach-mxs.c
b/arch/arm/mach-mxs/mach-mxs.c
index
9807037
..
c66129b
100644
(file)
--- a/
arch/arm/mach-mxs/mach-mxs.c
+++ b/
arch/arm/mach-mxs/mach-mxs.c
@@
-240,7
+240,7
@@
static void __init update_fec_mac_prop(enum mac_oui oui)
macaddr[4] = (val >> 8) & 0xff;
macaddr[5] = (val >> 0) & 0xff;
-
prom
_update_property(np, newmac);
+
of
_update_property(np, newmac);
}
}