diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2012-03-30 11:47:08 -0700 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-05-07 14:35:00 +0200 |
| commit | 8a8f422d3b4f2cde8e0e1d31638279a26a886a82 (patch) | |
| tree | 8d8a4387a45f962cd0fa4e9e24335e790adad0d4 /drivers/iommu | |
| parent | 95a02e976c39d63716b8c7c226bc530a2041536f (diff) | |
iommu: rename intr_remapping.[ch] to irq_remapping.[ch]
Make the file names consistent with the naming conventions of irq subsystem.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/Makefile | 2 | ||||
| -rw-r--r-- | drivers/iommu/dmar.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/intel_irq_remapping.c (renamed from drivers/iommu/intel_intr_remapping.c) | 4 | ||||
| -rw-r--r-- | drivers/iommu/irq_remapping.c (renamed from drivers/iommu/intr_remapping.c) | 2 | ||||
| -rw-r--r-- | drivers/iommu/irq_remapping.h (renamed from drivers/iommu/intr_remapping.h) | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 823e1cf8708f..3e5e82ae9f0d 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o obj-$(CONFIG_DMAR_TABLE) += dmar.o obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o -obj-$(CONFIG_IRQ_REMAP) += intel_intr_remapping.o intr_remapping.o +obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index ee74f698eef8..5ef65cf66152 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -36,7 +36,7 @@ #include <linux/tboot.h> #include <linux/dmi.h> #include <linux/slab.h> -#include <asm/intr_remapping.h> +#include <asm/irq_remapping.h> #include <asm/iommu_table.h> #define PREFIX "DMAR: " diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index cef5b8226f3d..bf2fbaad5e22 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -42,7 +42,7 @@ #include <linux/dmi.h> #include <linux/pci-ats.h> #include <linux/memblock.h> -#include <asm/intr_remapping.h> +#include <asm/irq_remapping.h> #include <asm/cacheflush.h> #include <asm/iommu.h> diff --git a/drivers/iommu/intel_intr_remapping.c b/drivers/iommu/intel_irq_remapping.c index efeb601c782f..b4d39507681a 100644 --- a/drivers/iommu/intel_intr_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -11,11 +11,11 @@ #include <asm/cpu.h> #include <linux/intel-iommu.h> #include <acpi/acpi.h> -#include <asm/intr_remapping.h> +#include <asm/irq_remapping.h> #include <asm/pci-direct.h> #include <asm/msidef.h> -#include "intr_remapping.h" +#include "irq_remapping.h" struct ioapic_scope { struct intel_iommu *iommu; diff --git a/drivers/iommu/intr_remapping.c b/drivers/iommu/irq_remapping.c index 523a7b3a1205..1cf350e02da8 100644 --- a/drivers/iommu/intr_remapping.c +++ b/drivers/iommu/irq_remapping.c @@ -2,7 +2,7 @@ #include <linux/string.h> #include <linux/errno.h> -#include "intr_remapping.h" +#include "irq_remapping.h" int irq_remapping_enabled; diff --git a/drivers/iommu/intr_remapping.h b/drivers/iommu/irq_remapping.h index bd5d98fec148..b12974cc1dfe 100644 --- a/drivers/iommu/intr_remapping.h +++ b/drivers/iommu/irq_remapping.h @@ -19,8 +19,8 @@ * remapping drivers but with no need to be visible outside of the IOMMU layer. */ -#ifndef __INTR_REMAPPING_H -#define __INTR_REMAPPING_H +#ifndef __IRQ_REMAPPING_H +#define __IRQ_REMAPPING_H #ifdef CONFIG_IRQ_REMAP @@ -85,4 +85,4 @@ extern struct irq_remap_ops intel_irq_remap_ops; #endif /* CONFIG_IRQ_REMAP */ -#endif /* __INTR_REMAPPING_H */ +#endif /* __IRQ_REMAPPING_H */ |