Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[karo-tx-linux.git] / drivers / vfio / Kconfig

diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig
index 9acb1e729bd6003848792c06c802d4f87b89d9b4..7cd5dec0abd1e44a3b8eabf091b6cd42204d6877 100644 (file)
--- a/drivers/vfio/Kconfig
+++ b/drivers/vfio/Kconfig
@@ -1,8 +1,16 @@
+config VFIO_IOMMU_TYPE1
+       tristate
+       depends on VFIO
+       default n
+
 menuconfig VFIO
        tristate "VFIO Non-Privileged userspace driver framework"
        depends on IOMMU_API
+       select VFIO_IOMMU_TYPE1 if X86
        help
          VFIO provides a framework for secure userspace device drivers.
          See Documentation/vfio.txt for more details.
 
          If you don't know what to do here, say N.
+
+source "drivers/vfio/pci/Kconfig"