---

yaml --- r: 320749 b: refs/heads/master c: 89e1f7d h: refs/heads/master i: 320747: 5c7293d v: v3
git-mirror · Jul 31, 2012 · cb21e9b · cb21e9b
1 parent c485178
commit cb21e9b
Show file tree

Hide file tree

Showing 10 changed files with 3,260 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73fa0d10d077d9521ee2dace2307ae2c9a965336
+refs/heads/master: 89e1f7d4c66d85f42c3d52ea3866eb10cadf6153
diff --git a/trunk/drivers/vfio/Kconfig b/trunk/drivers/vfio/Kconfig
@@ -12,3 +12,5 @@ menuconfig VFIO
 	  See Documentation/vfio.txt for more details.
 
 	  If you don't know what to do here, say N.
+
+source "drivers/vfio/pci/Kconfig"
diff --git a/trunk/drivers/vfio/pci/Kconfig b/trunk/drivers/vfio/pci/Kconfig
@@ -0,0 +1,8 @@
+config VFIO_PCI
+	tristate "VFIO support for PCI devices"
+	depends on VFIO && PCI && EVENTFD
+	help
+	  Support for the PCI VFIO bus driver.  This is required to make
+	  use of PCI drivers using the VFIO framework.
+
+	  If you don't know what to do here, say N.
diff --git a/trunk/drivers/vfio/pci/Makefile b/trunk/drivers/vfio/pci/Makefile
@@ -0,0 +1,4 @@
+
+vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o
+
+obj-$(CONFIG_VFIO_PCI) += vfio-pci.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ menuconfig VFIO
		See Documentation/vfio.txt for more details.

		If you don't know what to do here, say N.

		source "drivers/vfio/pci/Kconfig"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@

		vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o

		obj-$(CONFIG_VFIO_PCI) += vfio-pci.o