diff options
| author | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /arch/microblaze/include/asm/hardirq.h | |
| parent | b08dc3eba0c34027010caeda258f495074ae3a54 (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
Merge branch 'master' into next
Conflicts:
security/Kconfig
Manual fix.
Signed-off-by: James Morris <jmorris@namei.org>
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 @@ | |||
| 12 | /* should be defined in each interrupt controller driver */ | 12 | /* should be defined in each interrupt controller driver */ |
| 13 | extern unsigned int get_irq(struct pt_regs *regs); | 13 | extern unsigned int get_irq(struct pt_regs *regs); |
| 14 | 14 | ||
| 15 | #define ack_bad_irq ack_bad_irq | ||
| 16 | void ack_bad_irq(unsigned int irq); | ||
| 17 | #include <asm-generic/hardirq.h> | 15 | #include <asm-generic/hardirq.h> |
| 18 | 16 | ||
| 19 | #endif /* _ASM_MICROBLAZE_HARDIRQ_H */ | 17 | #endif /* _ASM_MICROBLAZE_HARDIRQ_H */ |