diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/asm-h8300/irq.h | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-h8300/irq.h')
| -rw-r--r-- | include/asm-h8300/irq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-h8300/irq.h b/include/asm-h8300/irq.h index 42a3ac424a9e..41be646c3514 100644 --- a/include/asm-h8300/irq.h +++ b/include/asm-h8300/irq.h | |||
| @@ -61,6 +61,5 @@ static __inline__ int irq_canonicalize(int irq) | |||
| 61 | 61 | ||
| 62 | extern void enable_irq(unsigned int); | 62 | extern void enable_irq(unsigned int); |
| 63 | extern void disable_irq(unsigned int); | 63 | extern void disable_irq(unsigned int); |
| 64 | #define disable_irq_nosync(x) disable_irq(x) | ||
| 65 | 64 | ||
| 66 | #endif /* _H8300_IRQ_H_ */ | 65 | #endif /* _H8300_IRQ_H_ */ |