summaryrefslogtreecommitdiffstats
path: root/drivers/xen/Makefile
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-07-20 15:33:51 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-07-20 15:33:51 -0400
commit3a6d28b11a895d08b6b4fc6f16dd9ff995844b45 (patch)
tree6a37a1260a1f873d719e04383ede6e487a1f7e99 /drivers/xen/Makefile
parent136d9ebff300044865693a57d68fe5905635992a (diff)
parent2ebdc4263022e0015341016b123fe7f44f9cf396 (diff)
downloadblackbird-op-linux-3a6d28b11a895d08b6b4fc6f16dd9ff995844b45.tar.gz
blackbird-op-linux-3a6d28b11a895d08b6b4fc6f16dd9ff995844b45.zip
Merge branch 'stable/xen-pciback-0.6.3' into stable/drivers
* stable/xen-pciback-0.6.3: xen/pciback: Have 'passthrough' option instead of XEN_PCIDEV_BACKEND_PASS and XEN_PCIDEV_BACKEND_VPCI xen/pciback: Remove the DEBUG option. xen/pciback: Drop two backends, squash and cleanup some code. xen/pciback: Print out the MSI/MSI-X (PIRQ) values xen/pciback: Don't setup an fake IRQ handler for SR-IOV devices. xen: rename pciback module to xen-pciback. xen/pciback: Fine-grain the spinlocks and fix BUG: scheduling while atomic cases. xen/pciback: Allocate IRQ handler for device that is shared with guest. xen/pciback: Disable MSI/MSI-X when reseting a device xen/pciback: guest SR-IOV support for PV guest xen/pciback: Register the owner (domain) of the PCI device. xen/pciback: Cleanup the driver based on checkpatch warnings and errors. xen/pciback: xen pci backend driver. Conflicts: drivers/xen/Kconfig
Diffstat (limited to 'drivers/xen/Makefile')
-rw-r--r--drivers/xen/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index bc3bf5679f6e..72bbb27d7a68 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o
obj-$(CONFIG_XEN_TMEM) += tmem.o
obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o
obj-$(CONFIG_XEN_DOM0) += pci.o
+obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/
xen-evtchn-y := evtchn.o
xen-gntdev-y := gntdev.o
OpenPOWER on IntegriCloud