diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-07 12:56:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-07 12:58:28 +0200 |
| commit | b395fb36d59e17b9335805c10fa30fc51c8a94c6 (patch) | |
| tree | b96bc8eee33753e2a1b1181c62a028d7f89643d7 /drivers/Makefile | |
| parent | Linux 3.0-rc6 (diff) | |
| parent | iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n (diff) | |
| download | linux-b395fb36d59e17b9335805c10fa30fc51c8a94c6.tar.xz linux-b395fb36d59e17b9335805c10fa30fc51c8a94c6.zip | |
Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 09f3232bcdcd..2b551e971726 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -122,3 +122,4 @@ obj-y += ieee802154/ obj-y += clk/ obj-$(CONFIG_HWSPINLOCK) += hwspinlock/ +obj-$(CONFIG_IOMMU_SUPPORT) += iommu/ |