diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /include/asm-x86/hw_irq.h | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/hw_irq.h')
| -rw-r--r-- | include/asm-x86/hw_irq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h index 18f067c310f7..77ba51df5668 100644 --- a/include/asm-x86/hw_irq.h +++ b/include/asm-x86/hw_irq.h | |||
| @@ -48,6 +48,7 @@ extern void irq_move_cleanup_interrupt(void); | |||
| 48 | extern void threshold_interrupt(void); | 48 | extern void threshold_interrupt(void); |
| 49 | 49 | ||
| 50 | extern void call_function_interrupt(void); | 50 | extern void call_function_interrupt(void); |
| 51 | extern void call_function_single_interrupt(void); | ||
| 51 | 52 | ||
| 52 | /* PIC specific functions */ | 53 | /* PIC specific functions */ |
| 53 | extern void disable_8259A_irq(unsigned int irq); | 54 | extern void disable_8259A_irq(unsigned int irq); |