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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
microblaze
/
include
/
asm
/
hardirq.h
diff --git
a/arch/microblaze/include/asm/hardirq.h
b/arch/microblaze/include/asm/hardirq.h
index
41e1e1a
..
cd1ac9a
100644
(file)
--- 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);
/* 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 */
#include <asm-generic/hardirq.h>
#endif /* _ASM_MICROBLAZE_HARDIRQ_H */