diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-v850/irq.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-v850/irq.h')
| -rw-r--r-- | include/asm-v850/irq.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-v850/irq.h b/include/asm-v850/irq.h index 88687c181f01..7d0d4cd1ce54 100644 --- a/include/asm-v850/irq.h +++ b/include/asm-v850/irq.h | |||
| @@ -50,16 +50,6 @@ init_irq_handlers (int base_irq, int num, int interval, | |||
| 50 | interrupt. */ | 50 | interrupt. */ |
| 51 | extern unsigned int handle_irq (int irq, struct pt_regs *regs); | 51 | extern unsigned int handle_irq (int irq, struct pt_regs *regs); |
| 52 | 52 | ||
| 53 | |||
| 54 | /* Enable interrupt handling on an irq. */ | ||
| 55 | extern void enable_irq(unsigned int irq); | ||
| 56 | |||
| 57 | /* Disable an irq and wait for completion. */ | ||
| 58 | extern void disable_irq (unsigned int irq); | ||
| 59 | |||
| 60 | /* Disable an irq without waiting. */ | ||
| 61 | extern void disable_irq_nosync (unsigned int irq); | ||
| 62 | |||
| 63 | #endif /* !__ASSEMBLY__ */ | 53 | #endif /* !__ASSEMBLY__ */ |
| 64 | 54 | ||
| 65 | #endif /* __V850_IRQ_H__ */ | 55 | #endif /* __V850_IRQ_H__ */ |