diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:44:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:44:34 +1100 |
| commit | c2f84dc1815ee05e96c156730ac3d389d63de96a (patch) | |
| tree | b00992b0645286c3b1a9241fbd37394f788afc45 | |
| parent | d41555e45daad560a1fd073cbc984a3f7be39ca3 (diff) | |
| parent | d88423f7844ea9941d55bde92716a50c3e131dd7 (diff) | |
Merge remote-tracking branch 'vfio/next'
| -rw-r--r-- | drivers/vfio/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig index 23eced02aaf6..c84333eb5eb5 100644 --- a/drivers/vfio/Kconfig +++ b/drivers/vfio/Kconfig @@ -6,12 +6,12 @@ config VFIO_IOMMU_TYPE1 config VFIO_IOMMU_SPAPR_TCE tristate depends on VFIO && SPAPR_TCE_IOMMU - default n + default VFIO config VFIO_SPAPR_EEH tristate depends on EEH && VFIO_IOMMU_SPAPR_TCE - default n + default VFIO config VFIO_VIRQFD tristate @@ -22,8 +22,6 @@ menuconfig VFIO tristate "VFIO Non-Privileged userspace driver framework" depends on IOMMU_API select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM_SMMU || ARM_SMMU_V3) - select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES) - select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES) select ANON_INODES help VFIO provides a framework for secure userspace device drivers. |