diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-07 10:56:44 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-07 10:58:28 (GMT) |
| commit | b395fb36d59e17b9335805c10fa30fc51c8a94c6 (patch) | |
| tree | b96bc8eee33753e2a1b1181c62a028d7f89643d7 /drivers/pci/Makefile | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| parent | 6b385b46ee17d7e1a68d3411b8cdb2342e0f0445 (diff) | |
| download | linux-b395fb36d59e17b9335805c10fa30fc51c8a94c6.tar.xz | |
Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 094308e..825c02b 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -29,11 +29,6 @@ obj-$(CONFIG_PCI_MSI) += msi.o # Build the Hypertransport interrupt support obj-$(CONFIG_HT_IRQ) += htirq.o -# Build Intel IOMMU support -obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o - -obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o - obj-$(CONFIG_PCI_IOV) += iov.o # |