Skip to content

Commit 85ef671

Browse files
DerDakonjoergroedel
authored andcommitted
iommu: make inclusion of amd directory conditional
Nothing in there is active if CONFIG_AMD_IOMMU is not enabled, so the whole directory can depend on that switch as well. Fixes: cbe94c6 ("iommu/amd: Move Kconfig and Makefile bits down into amd directory") Signed-off-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com> Link: https://lore.kernel.org/r/1894970.atdPhlSkOF@devpool92.emlix.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent ddcc66c commit 85ef671

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/iommu/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
obj-y += amd/ arm/ iommufd/ riscv/
2+
obj-y += arm/ iommufd/ riscv/
3+
obj-$(CONFIG_AMD_IOMMU) += amd/
34
obj-$(CONFIG_INTEL_IOMMU) += intel/
45
obj-$(CONFIG_IOMMU_API) += iommu.o
56
obj-$(CONFIG_IOMMU_SUPPORT) += iommu-pages.o

drivers/iommu/amd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
obj-$(CONFIG_AMD_IOMMU) += iommu.o init.o quirks.o io_pgtable.o io_pgtable_v2.o ppr.o pasid.o
2+
obj-y += iommu.o init.o quirks.o io_pgtable.o io_pgtable_v2.o ppr.o pasid.o
33
obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += debugfs.o

0 commit comments

Comments
 (0)