summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudeep Dutt <sudeep.dutt@intel.com>2015-10-04 13:38:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-05 04:37:28 +0100
commitac6d83ccd9c5eaeb610bd65b27adc84b47a1498a (patch)
tree3c12853392a648a32ef26eb6c8fd08a0194c0a9c
parent5760b0a565e0f64dfb90d8c42df949f966038e1d (diff)
downloadlinux-ac6d83ccd9c5eaeb610bd65b27adc84b47a1498a.tar.bz2
misc: mic: Fix SCIF build failure with IOMMU_SUPPORT disabled
SCIF depends on IOVA which requires IOMMU_SUPPORT to be enabled. The long term fix is to move IOVA from drivers/iommu to lib/ but this current patch should fix the reported issue. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com> Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mic/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig
index 60376fb9f3f4..40677df7f996 100644
--- a/drivers/misc/mic/Kconfig
+++ b/drivers/misc/mic/Kconfig
@@ -74,7 +74,7 @@ comment "SCIF Driver"
config SCIF
tristate "SCIF Driver"
- depends on 64BIT && PCI && X86 && SCIF_BUS
+ depends on 64BIT && PCI && X86 && SCIF_BUS && IOMMU_SUPPORT
select IOMMU_IOVA
help
This enables SCIF Driver support for the Intel Many Integrated