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 @@ * the x86 interrupt management code. */ -#ifndef __X86_INTR_REMAPPING_H -#define __X86_INTR_REMAPPING_H +#ifndef __X86_IRQ_REMAPPING_H +#define __X86_IRQ_REMAPPING_H #ifdef CONFIG_IRQ_REMAP @@ -100,4 +100,4 @@ static inline int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) } #endif /* CONFIG_IRQ_REMAP */ -#endif /* __X86_INTR_REMAPPING_H */ +#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 @@ #include <linux/smp.h> #include <linux/mm.h> -#include <asm/intr_remapping.h> +#include <asm/irq_remapping.h> #include <asm/perf_event.h> #include <asm/x86_init.h> #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 @@ #include <asm/msidef.h> #include <asm/hypertransport.h> #include <asm/setup.h> -#include <asm/intr_remapping.h> +#include <asm/irq_remapping.h> #include <asm/hpet.h> #include <asm/hw_irq.h> |