diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-20 14:24:33 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-20 14:24:33 -0400 |
| commit | 39cf0518d89d1f0af79554457c52adb5b12fa43c (patch) | |
| tree | 3d04a6efe1e2afb6db7091af4b7033a56ae1b077 /arch/microblaze/include | |
| parent | af15c1addf920d830b030e3489a482456904ca8c (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/microblaze/include')
| -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 */ |