---

yaml --- r: 72263 b: refs/heads/master c: 296f96f h: refs/heads/master i: 72261: 570e801 72259: 91a9366 72255: caca5ea v: v3
git-mirror · Oct 23, 2007 · 8b21eb4 · 8b21eb4
1 parent 8cf2c1d
commit 8b21eb4
Show file tree

Hide file tree

Showing 6 changed files with 480 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec3d41c4db4c21164332826ea8d812f94f2f6886
+refs/heads/master: 296f96fcfc160e29c01819c0c7b20c2dc8320edd
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -3100,4 +3100,10 @@ config NETPOLL_TRAP
 config NET_POLL_CONTROLLER
 	def_bool NETPOLL
 
+config VIRTIO_NET
+	tristate "Virtio network driver (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && VIRTIO
+	---help---
+	  This is the virtual network driver for lguest.  Say Y or M.
+
 endif # NETDEVICES
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -243,3 +243,4 @@ obj-$(CONFIG_FS_ENET) += fs_enet/
 
 obj-$(CONFIG_NETXEN_NIC) += netxen/
 obj-$(CONFIG_NIU) += niu.o
+obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -243,3 +243,4 @@ obj-$(CONFIG_FS_ENET) += fs_enet/

		obj-$(CONFIG_NETXEN_NIC) += netxen/
		obj-$(CONFIG_NIU) += niu.o
		obj-$(CONFIG_VIRTIO_NET) += virtio_net.o