diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /include/asm-x86/irq.h | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'include/asm-x86/irq.h')
| -rw-r--r-- | include/asm-x86/irq.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/irq.h b/include/asm-x86/irq.h index 1a2925757317..1e5f2909c1db 100644 --- a/include/asm-x86/irq.h +++ b/include/asm-x86/irq.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_IRQ_H | 1 | #ifndef ASM_X86__IRQ_H |
| 2 | #define _ASM_IRQ_H | 2 | #define ASM_X86__IRQ_H |
| 3 | /* | 3 | /* |
| 4 | * (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar | 4 | * (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar |
| 5 | * | 5 | * |
| @@ -47,4 +47,4 @@ extern void native_init_IRQ(void); | |||
| 47 | /* Interrupt vector management */ | 47 | /* Interrupt vector management */ |
| 48 | extern DECLARE_BITMAP(used_vectors, NR_VECTORS); | 48 | extern DECLARE_BITMAP(used_vectors, NR_VECTORS); |
| 49 | 49 | ||
| 50 | #endif /* _ASM_IRQ_H */ | 50 | #endif /* ASM_X86__IRQ_H */ |