diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
| commit | 0c8c708a7e6b52556ee9079041f504191ec5f0e9 (patch) | |
| tree | fb8da2f5e70ac1d21d41d5a900e48d42c1c999eb /include/asm-x86/hardirq_32.h | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
| parent | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (diff) | |
Merge branch 'x86/core' into x86/unify-cpu-detect
Diffstat (limited to 'include/asm-x86/hardirq_32.h')
| -rw-r--r-- | include/asm-x86/hardirq_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/hardirq_32.h b/include/asm-x86/hardirq_32.h index 4f85f0f4b563..700fe230d919 100644 --- a/include/asm-x86/hardirq_32.h +++ b/include/asm-x86/hardirq_32.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __ASM_HARDIRQ_H | 1 | #ifndef ASM_X86__HARDIRQ_32_H |
| 2 | #define __ASM_HARDIRQ_H | 2 | #define ASM_X86__HARDIRQ_32_H |
| 3 | 3 | ||
| 4 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 5 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
| @@ -25,4 +25,4 @@ DECLARE_PER_CPU(irq_cpustat_t, irq_stat); | |||
| 25 | void ack_bad_irq(unsigned int irq); | 25 | void ack_bad_irq(unsigned int irq); |
| 26 | #include <linux/irq_cpustat.h> | 26 | #include <linux/irq_cpustat.h> |
| 27 | 27 | ||
| 28 | #endif /* __ASM_HARDIRQ_H */ | 28 | #endif /* ASM_X86__HARDIRQ_32_H */ |