diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/arm/include/asm/irq.h | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/include/asm/irq.h')
| -rw-r--r-- | arch/arm/include/asm/irq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 2721a5814cb9..5a526afb5f18 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h | |||
| @@ -23,6 +23,7 @@ struct pt_regs; | |||
| 23 | extern void migrate_irqs(void); | 23 | extern void migrate_irqs(void); |
| 24 | 24 | ||
| 25 | extern void asm_do_IRQ(unsigned int, struct pt_regs *); | 25 | extern void asm_do_IRQ(unsigned int, struct pt_regs *); |
| 26 | void handle_IRQ(unsigned int, struct pt_regs *); | ||
| 26 | void init_IRQ(void); | 27 | void init_IRQ(void); |
| 27 | 28 | ||
| 28 | #endif | 29 | #endif |