- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b982854..821b8b6 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -295,9 +295,9 @@ source "drivers/net/wimax/Kconfig"
 
 source "drivers/net/wan/Kconfig"
 
-config XEN_NETDEV_FRONTEND
+config PARAVIRT_XEN_NETDEV_FRONTEND
        tristate "Xen network device frontend driver"
-       depends on XEN
+       depends on PARAVIRT_XEN
        select XEN_XENBUS_FRONTEND
        default y
        help
@@ -306,15 +306,15 @@ config XEN_NETDEV_FRONTEND
          domain 0).
 
          The corresponding Linux backend driver is enabled by the
-         CONFIG_XEN_NETDEV_BACKEND option.
+         PARAVIRT_XEN_NETDEV_BACKEND option.
 
          If you are compiling a kernel for use as Xen guest, you
          should say Y here. To compile this driver as a module, chose
          M here: the module will be called xen-netfront.
 
-config XEN_NETDEV_BACKEND
+config PARAVIRT_XEN_NETDEV_BACKEND
        tristate "Xen backend network device"
-       depends on XEN_BACKEND
+       depends on PARAVIRT_XEN_BACKEND
        help
          This driver allows the kernel to act as a Xen network driver
          domain which exports paravirtual network devices to other
@@ -322,7 +322,7 @@ config XEN_NETDEV_BACKEND
          system that implements a compatible front end.
 
          The corresponding Linux frontend driver is enabled by the
-         CONFIG_XEN_NETDEV_FRONTEND configuration option.
+         PARAVIRT_XEN_NETDEV_FRONTEND configuration option.
 
          The backend driver presents a standard network device
          endpoint for each paravirtual network device to the driver
@@ -336,7 +336,7 @@ config XEN_NETDEV_BACKEND
 
 config VMXNET3
        tristate "VMware VMXNET3 ethernet driver"
-       depends on PCI && INET
+       depends on PCI && INET && !XEN
        help
          This driver supports VMware's vmxnet3 virtual ethernet NIC.
          To compile this driver as a module, choose M here: the