diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /include/asm-v850/irq.h | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'include/asm-v850/irq.h')
| -rw-r--r-- | include/asm-v850/irq.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-v850/irq.h b/include/asm-v850/irq.h index 1bf096db8f4c..88687c181f01 100644 --- a/include/asm-v850/irq.h +++ b/include/asm-v850/irq.h | |||
| @@ -46,8 +46,6 @@ extern void | |||
| 46 | init_irq_handlers (int base_irq, int num, int interval, | 46 | init_irq_handlers (int base_irq, int num, int interval, |
| 47 | struct hw_interrupt_type *irq_type); | 47 | struct hw_interrupt_type *irq_type); |
| 48 | 48 | ||
| 49 | typedef void (*irq_handler_t)(int irq, void *data, struct pt_regs *regs); | ||
| 50 | |||
| 51 | /* Handle interrupt IRQ. REGS are the registers at the time of ther | 49 | /* Handle interrupt IRQ. REGS are the registers at the time of ther |
| 52 | interrupt. */ | 50 | interrupt. */ |
| 53 | extern unsigned int handle_irq (int irq, struct pt_regs *regs); | 51 | extern unsigned int handle_irq (int irq, struct pt_regs *regs); |