diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/include/asm/irq_remapping.h (renamed from arch/ia64/include/asm/intr_remapping.h) | 0 | ||||
-rw-r--r-- | arch/x86/include/asm/irq_remapping.h (renamed from arch/x86/include/asm/intr_remapping.h) | 6 | ||||
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/include/asm/intr_remapping.h b/arch/ia64/include/asm/irq_remapping.h index a8687b1d8906..a8687b1d8906 100644 --- a/arch/ia64/include/asm/intr_remapping.h +++ b/arch/ia64/include/asm/irq_remapping.h | |||
diff --git a/arch/x86/include/asm/intr_remapping.h b/arch/x86/include/asm/irq_remapping.h index f9cbbcb2956e..dcb0c7231028 100644 --- a/arch/x86/include/asm/intr_remapping.h +++ b/arch/x86/include/asm/irq_remapping.h | |||
@@ -19,8 +19,8 @@ | |||
19 | * the x86 interrupt management code. | 19 | * the x86 interrupt management code. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #ifndef __X86_INTR_REMAPPING_H | 22 | #ifndef __X86_IRQ_REMAPPING_H |
23 | #define __X86_INTR_REMAPPING_H | 23 | #define __X86_IRQ_REMAPPING_H |
24 | 24 | ||
25 | #ifdef CONFIG_IRQ_REMAP | 25 | #ifdef CONFIG_IRQ_REMAP |
26 | 26 | ||
@@ -100,4 +100,4 @@ static inline int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) | |||
100 | } | 100 | } |
101 | #endif /* CONFIG_IRQ_REMAP */ | 101 | #endif /* CONFIG_IRQ_REMAP */ |
102 | 102 | ||
103 | #endif /* __X86_INTR_REMAPPING_H */ | 103 | #endif /* __X86_IRQ_REMAPPING_H */ |
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index c02c666c4628..3722179a49db 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <linux/smp.h> | 35 | #include <linux/smp.h> |
36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
37 | 37 | ||
38 | #include <asm/intr_remapping.h> | 38 | #include <asm/irq_remapping.h> |
39 | #include <asm/perf_event.h> | 39 | #include <asm/perf_event.h> |
40 | #include <asm/x86_init.h> | 40 | #include <asm/x86_init.h> |
41 | #include <asm/pgalloc.h> | 41 | #include <asm/pgalloc.h> |
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index abbbcd4d1d71..ef0648cd7084 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -57,7 +57,7 @@ | |||
57 | #include <asm/msidef.h> | 57 | #include <asm/msidef.h> |
58 | #include <asm/hypertransport.h> | 58 | #include <asm/hypertransport.h> |
59 | #include <asm/setup.h> | 59 | #include <asm/setup.h> |
60 | #include <asm/intr_remapping.h> | 60 | #include <asm/irq_remapping.h> |
61 | #include <asm/hpet.h> | 61 | #include <asm/hpet.h> |
62 | #include <asm/hw_irq.h> | 62 | #include <asm/hw_irq.h> |
63 | 63 | ||