projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge from Linus' tree
[powerpc.git]
/
arch
/
ppc
/
syslib
/
ppc4xx_setup.c
diff --git
a/arch/ppc/syslib/ppc4xx_setup.c
b/arch/ppc/syslib/ppc4xx_setup.c
index
bf83240
..
e83a83f
100644
(file)
--- a/
arch/ppc/syslib/ppc4xx_setup.c
+++ b/
arch/ppc/syslib/ppc4xx_setup.c
@@
-278,7
+278,7
@@
ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5,
#endif /* defined(CONFIG_PCI) && defined(CONFIG_IDE) */
}
-/* Called from
MachineCheckE
xception */
+/* Called from
machine_check_e
xception */
void platform_machine_check(struct pt_regs *regs)
{
#if defined(DCRN_PLB0_BEAR)