git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
[pandora-kernel.git]
/
arch
/
ppc
/
kernel
/
traps.c
diff --git
a/arch/ppc/kernel/traps.c
b/arch/ppc/kernel/traps.c
index
d87423d
..
8356d54
100644
(file)
--- a/
arch/ppc/kernel/traps.c
+++ b/
arch/ppc/kernel/traps.c
@@
-849,10
+849,12
@@
void AltivecAssistException(struct pt_regs *regs)
}
#endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_E500
void PerformanceMonitorException(struct pt_regs *regs)
{
perf_irq(regs);
}
+#endif
#ifdef CONFIG_FSL_BOOKE
void CacheLockingException(struct pt_regs *regs, unsigned long address,