---

yaml --- r: 351569 b: refs/heads/master c: bb37f12 h: refs/heads/master i: 351567: f4bbdf3 v: v3
git-mirror · Jan 22, 2013 · 5059775 · 5059775
1 parent 94f25b4
commit 5059775
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1,505 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13a80cb8b72769f163834d4243bd156f1bec37dc
+refs/heads/master: bb37f1223a7ba9e0abf21d5392d0bb4aedce78f5
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -2974,11 +2974,6 @@ S:	Maintained
 F:	include/linux/netfilter_bridge/
 F:	net/bridge/
 
-ETHERTEAM 16I DRIVER
-M:	Mika Kuoppala <miku@iki.fi>
-S:	Maintained
-F:	drivers/net/ethernet/fujitsu/eth16i.c
-
 EXT2 FILE SYSTEM
 M:	Jan Kara <jack@suse.cz>
 L:	linux-ext4@vger.kernel.org

diff --git a/trunk/drivers/net/Space.c b/trunk/drivers/net/Space.c
@@ -45,7 +45,6 @@ extern struct net_device *ne_probe(int unit);
 extern struct net_device *hp_probe(int unit);
 extern struct net_device *hp_plus_probe(int unit);
 extern struct net_device *fmv18x_probe(int unit);
-extern struct net_device *eth16i_probe(int unit);
 extern struct net_device *i82596_probe(int unit);
 extern struct net_device *ewrk3_probe(int unit);
 extern struct net_device *e2100_probe(int unit);
@@ -139,9 +138,6 @@ static struct devprobe2 isa_probes[] __initdata = {
  	{cs89x0_probe, 0},
 #endif
 #endif
-#ifdef CONFIG_ETH16I
-	{eth16i_probe, 0},	/* ICL EtherTeam 16i/32 */
-#endif
 #ifdef CONFIG_EWRK3             /* DEC EtherWORKS 3 */
     	{ewrk3_probe, 0},
 #endif

diff --git a/trunk/drivers/net/ethernet/fujitsu/Kconfig b/trunk/drivers/net/ethernet/fujitsu/Kconfig
@@ -28,15 +28,4 @@ config PCMCIA_FMVJ18X
 	  To compile this driver as a module, choose M here: the module will be
 	  called fmvj18x_cs.  If unsure, say N.
 
-config ETH16I
-	tristate "ICL EtherTeam 16i/32 support"
-	depends on ISA
-	---help---
-	  If you have a network (Ethernet) card of this type, say Y and read
-	  the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called eth16i.
-
 endif # NET_VENDOR_FUJITSU
diff --git a/trunk/drivers/net/ethernet/fujitsu/Makefile b/trunk/drivers/net/ethernet/fujitsu/Makefile
@@ -2,5 +2,4 @@
 # Makefile for the Fujitsu network device drivers.
 #
 
-obj-$(CONFIG_ETH16I) += eth16i.o
 obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o