---

yaml --- r: 95353 b: refs/heads/master c: 090bf62 h: refs/heads/master i: 95351: a641ff6 v: v3
git-mirror · Apr 29, 2008 · cd7490d · cd7490d
1 parent 6012dee
commit cd7490d
Show file tree

Hide file tree

Showing 60 changed files with 13,426 additions and 79 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 697c269610179051cf19e45566fee3dcebbb1e93
+refs/heads/master: 090bf62199d6079cc47c0b78ced9508391b24fa1
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3522,6 +3522,13 @@ M:	pfg@sgi.com
 L:	linux-ia64@vger.kernel.org
 S:	Supported
 
+SFC NETWORK DRIVER
+P:	Steve Hodgson
+P:	Ben Hutchings
+P:	Robert Stonehouse
+M:	linux-net-drivers@solarflare.com
+S:	Supported
+
 SGI VISUAL WORKSTATION 320 AND 540
 P:	Andrey Panin
 M:	pazke@donpac.ru

diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2592,6 +2592,7 @@ config BNX2X
 	  To compile this driver as a module, choose M here: the module
 	  will be called bnx2x.  This is recommended.
 
+source "drivers/net/sfc/Kconfig"
 
 endif # NETDEV_10000
 

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -252,3 +252,5 @@ obj-$(CONFIG_FS_ENET) += fs_enet/
 obj-$(CONFIG_NETXEN_NIC) += netxen/
 obj-$(CONFIG_NIU) += niu.o
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
+obj-$(CONFIG_SFC) += sfc/
+