diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/blackfin/mach-common/irqpanic.c | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/blackfin/mach-common/irqpanic.c')
| -rw-r--r-- | arch/blackfin/mach-common/irqpanic.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/blackfin/mach-common/irqpanic.c b/arch/blackfin/mach-common/irqpanic.c index 606ded9ff4e..05004df0f78 100644 --- a/arch/blackfin/mach-common/irqpanic.c +++ b/arch/blackfin/mach-common/irqpanic.c @@ -33,8 +33,6 @@ #include <asm/traps.h> #include <asm/blackfin.h> -#include "../oprofile/op_blackfin.h" - #ifdef CONFIG_DEBUG_ICACHE_CHECK #define L1_ICACHE_START 0xffa10000 #define L1_ICACHE_END 0xffa13fff @@ -134,13 +132,3 @@ asmlinkage void irq_panic(int reason, struct pt_regs *regs) #endif } - -#ifdef CONFIG_HARDWARE_PM -/* - * call the handler of Performance overflow - */ -asmlinkage void pm_overflow(int irq, struct pt_regs *regs) -{ - pm_overflow_handler(irq, regs); -} -#endif |