diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 09:44:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 09:44:51 -0700 |
commit | 4aa2d56b2149e70a0b944b4f21e4aed33d9ab94e (patch) | |
tree | 79cb2115c36799406fa477ca80adeab041c31509 /arch/microblaze/include/asm/hardirq.h | |
parent | d46c7d9ab8289f23a5e161060b84fd7e63de7921 (diff) | |
parent | 1fef7891755d99039592aa8d1ed02e981f38de15 (diff) |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Update Microblaze defconfigs
microblaze: Use klimit instead of _end for memory init
microblaze: Enable ppoll syscall
microblaze: Sane handling of missing timer/intc in device tree
microblaze: use the generic ack_bad_irq implementation
Diffstat (limited to 'arch/microblaze/include/asm/hardirq.h')
-rw-r--r-- | arch/microblaze/include/asm/hardirq.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/hardirq.h b/arch/microblaze/include/asm/hardirq.h index 41e1e1aa36ac..cd1ac9aad56c 100644 --- a/arch/microblaze/include/asm/hardirq.h +++ b/arch/microblaze/include/asm/hardirq.h @@ -12,8 +12,6 @@ /* should be defined in each interrupt controller driver */ extern unsigned int get_irq(struct pt_regs *regs); -#define ack_bad_irq ack_bad_irq -void ack_bad_irq(unsigned int irq); #include <asm-generic/hardirq.h> #endif /* _ASM_MICROBLAZE_HARDIRQ_H */ |