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/base/Makefile | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| parent | 6b385b46ee17d7e1a68d3411b8cdb2342e0f0445 (diff) | |
| download | op-kernel-dev-b395fb36d59e17b9335805c10fa30fc51c8a94c6.zip op-kernel-dev-b395fb36d59e17b9335805c10fa30fc51c8a94c6.tar.gz | |
Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu
Diffstat (limited to 'drivers/base/Makefile')
| -rw-r--r-- | drivers/base/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 4c5701c..5ab0d07 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_FW_LOADER) += firmware_class.o obj-$(CONFIG_NUMA) += node.o obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o obj-$(CONFIG_SMP) += topology.o -obj-$(CONFIG_IOMMU_API) += iommu.o ifeq ($(CONFIG_SYSFS),y) obj-$(CONFIG_MODULES) += module.o endif |
