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/Makefile | |
parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
parent | 6b385b46ee17d7e1a68d3411b8cdb2342e0f0445 (diff) | |
download | linux-fsl-qoriq-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/Makefile')
-rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 09f3232..2b551e9 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/ |