Merge git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest

[~andy/linux] / drivers / xen / Kconfig

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 60d71e9abe9fa369ce4a9deb99f8050ff6e855b3..5a48ce996dea21558856a3fe8f024c9be1aa352e 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -29,6 +29,14 @@ config XEN_DEV_EVTCHN
          firing.
          If in doubt, say yes.
 
+config XEN_BACKEND
+       bool "Backend driver support"
+       depends on XEN_DOM0
+       default y
+       help
+         Support for backend device drivers that provide I/O services
+         to other virtual machines.
+
 config XENFS
        tristate "Xen filesystem"
        default y
@@ -62,6 +70,9 @@ config XEN_SYS_HYPERVISOR
         virtual environment, /sys/hypervisor will still be present,
         but will have no xen contents.
 
+config XEN_XENBUS_FRONTEND
+       tristate
+
 config XEN_PLATFORM_PCI
        tristate "xen platform pci device driver"
        depends on XEN_PVHVM
@@ -74,6 +85,7 @@ config XEN_PLATFORM_PCI
 
 config SWIOTLB_XEN
        def_bool y
-       depends on SWIOTLB
+       depends on PCI
+       select SWIOTLB
 
 endmenu