Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / xen / Kconfig

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 6e6180ccd72609b349b972cb45cbbee67a148e1f..07bec09d1dad778f6f69bb307769d02b8a29c4c7 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,9 +70,19 @@ 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_GNTDEV
+       tristate "userspace grant access device driver"
+       depends on XEN
+       select MMU_NOTIFIER
+       help
+         Allows userspace processes to use grants.
+
 config XEN_PLATFORM_PCI
        tristate "xen platform pci device driver"
-       depends on XEN_PVHVM
+       depends on XEN_PVHVM && PCI
        default m
        help
          Driver for the Xen PCI Platform device: it is responsible for