diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/asm-x86/i8259.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'include/asm-x86/i8259.h')
| -rw-r--r-- | include/asm-x86/i8259.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-x86/i8259.h b/include/asm-x86/i8259.h index 2f98df91f1f2..23c1b3baaecd 100644 --- a/include/asm-x86/i8259.h +++ b/include/asm-x86/i8259.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __ASM_I8259_H__ | 1 | #ifndef ASM_X86__I8259_H |
| 2 | #define __ASM_I8259_H__ | 2 | #define ASM_X86__I8259_H |
| 3 | 3 | ||
| 4 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
| 5 | 5 | ||
| @@ -57,4 +57,7 @@ static inline void outb_pic(unsigned char value, unsigned int port) | |||
| 57 | 57 | ||
| 58 | extern struct irq_chip i8259A_chip; | 58 | extern struct irq_chip i8259A_chip; |
| 59 | 59 | ||
| 60 | #endif /* __ASM_I8259_H__ */ | 60 | extern void mask_8259A(void); |
| 61 | extern void unmask_8259A(void); | ||
| 62 | |||
| 63 | #endif /* ASM_X86__I8259_H */ | ||