aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-08-20 20:24:33 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-08-20 20:24:33 +0200
commit39cf0518d89d1f0af79554457c52adb5b12fa43c (patch)
tree3d04a6efe1e2afb6db7091af4b7033a56ae1b077 /arch/microblaze/include
parentMerge branch 'master' into for-linus (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (diff)
downloadlinux-dev-39cf0518d89d1f0af79554457c52adb5b12fa43c.tar.xz
linux-dev-39cf0518d89d1f0af79554457c52adb5b12fa43c.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/microblaze/include')
-rw-r--r--arch/microblaze/include/asm/hardirq.h2
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 */