projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.19-rc0b-tag' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
corenet_generic.c
diff --git
a/arch/powerpc/platforms/85xx/corenet_generic.c
b/arch/powerpc/platforms/85xx/corenet_generic.c
index
e56b89a
..
1f309cc
100644
(file)
--- a/
arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/
arch/powerpc/platforms/85xx/corenet_generic.c
@@
-170,7
+170,7
@@
static int __init corenet_generic_probe(void)
ppc_md.get_irq = ehv_pic_get_irq;
ppc_md.restart = fsl_hv_restart;
- p
pc_md.
power_off = fsl_hv_halt;
+ p
m_
power_off = fsl_hv_halt;
ppc_md.halt = fsl_hv_halt;
#ifdef CONFIG_SMP
/*