---

yaml --- r: 95347 b: refs/heads/master c: 4709aa5 h: refs/heads/master i: 95345: 0aab5c9 95343: 670f82f v: v3
git-mirror · Apr 27, 2008 · a74a744 · a74a744
1 parent 8d10ea7
commit a74a744
Show file tree

Hide file tree

Showing 61 changed files with 94 additions and 13,448 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ceee660aacb29721e26f08e336c58dc4847d1bd
+refs/heads/master: 4709aa59ede5ff9902d60088d93d1c0e2e9d2247
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3522,13 +3522,6 @@ 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,7 +2592,6 @@ 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,5 +252,3 @@ 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/
-