diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 16:11:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 16:11:53 +0200 |
| commit | 982653009b883ef1529089e3e6f1ae2fee41cbe2 (patch) | |
| tree | eec3b1fe947d442ee204a2d648133bc5223e5c59 /drivers/iommu/Makefile | |
| parent | 37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec (diff) | |
| parent | c020570138f5d9cb1fc0a853f9cf9e641178b5c5 (diff) | |
| download | op-kernel-dev-982653009b883ef1529089e3e6f1ae2fee41cbe2.zip op-kernel-dev-982653009b883ef1529089e3e6f1ae2fee41cbe2.tar.gz | |
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, ioapic: Consolidate the explicit EOI code
x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()
x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC
iommu: Rename the DMAR and INTR_REMAP config options
x86, ioapic: Define irq_remap_modify_chip_defaults()
x86, msi, intr-remap: Use the ioapic set affinity routine
iommu: Cleanup ifdefs in detect_intel_iommu()
iommu: No need to set dmar_disabled in check_zero_address()
iommu: Move IOMMU specific code to intel-iommu.c
intr_remap: Call dmar_dev_scope_init() explicitly
x86, x2apic: Enable the bios request for x2apic optout
Diffstat (limited to 'drivers/iommu/Makefile')
| -rw-r--r-- | drivers/iommu/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 4d4d77d..6394994a 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o -obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o -obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o +obj-$(CONFIG_DMAR_TABLE) += dmar.o +obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o +obj-$(CONFIG_IRQ_REMAP) += intr_remapping.o |
