Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdb7a342 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

Automatic merge of /spare/repo/netdev-2.6 branch remove-drivers

parents 140fedb5 5aa83a4c

Documentation/networking/multicast.txt

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ ni52 <------------------ Buggy ------------------> 
ni65		YES		YES		YES		Software(#)

seeq		NO		NO		NO		N/A

sgiseek		<------------------ Buggy ------------------>

sk_g16		NO		NO		YES		N/A

smc-ultra	YES		YES		YES		Hardware

sunlance	YES		YES		YES		Hardware

tulip		YES		YES		YES		Hardware

Documentation/networking/net-modules.txt

+0 −3
Original line number Diff line number Diff line
@@ -284,9 +284,6 @@ ppp.c: 
seeq8005.c: *Not modularized*

	(Probes ports: 0x300, 0x320, 0x340, 0x360)



sk_g16.c: *Not modularized*

	(Probes ports: 0x100, 0x180, 0x208, 0x220m 0x288, 0x320, 0x328, 0x390)



skeleton.c: *Skeleton*



slhc.c:

drivers/net/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -1001,21 +1001,6 @@ config EEXPRESS_PRO 
	  <file:Documentation/networking/net-modules.txt>. The module

	  will be called eepro.



config FMV18X

	tristate "FMV-181/182/183/184 support (OBSOLETE)"

	depends on NET_ISA && OBSOLETE

	---help---

	  If you have a Fujitsu FMV-181/182/183/184 network (Ethernet) card,

	  say Y and read the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  If you use an FMV-183 or FMV-184 and it is not working, you may need

	  to disable Plug & Play mode of the card.



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/networking/net-modules.txt>. The module

	  will be called fmv18x.



config HPLAN_PLUS

	tristate "HP PCLAN+ (27247B and 27252A) support"

	depends on NET_ISA
@@ -1104,14 +1089,6 @@ config SEEQ8005 
	  <file:Documentation/networking/net-modules.txt>. The module

	  will be called seeq8005.



config SK_G16

	tristate "SK_G16 support (OBSOLETE)"

	depends on NET_ISA && OBSOLETE

	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>.



config SKMC

	tristate "SKnet MCA support"

	depends on NET_ETHERNET && MCA && BROKEN

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ obj-$(CONFIG_MAC8390) += mac8390.o 8390.o 
obj-$(CONFIG_APNE) += apne.o 8390.o

obj-$(CONFIG_PCMCIA_PCNET) += 8390.o

obj-$(CONFIG_SHAPER) += shaper.o

obj-$(CONFIG_SK_G16) += sk_g16.o

obj-$(CONFIG_HP100) += hp100.o

obj-$(CONFIG_SMC9194) += smc9194.o

obj-$(CONFIG_FEC) += fec.o
@@ -122,7 +121,6 @@ obj-$(CONFIG_DEFXX) += defxx.o 
obj-$(CONFIG_SGISEEQ) += sgiseeq.o

obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o

obj-$(CONFIG_AT1700) += at1700.o

obj-$(CONFIG_FMV18X) += fmv18x.o

obj-$(CONFIG_EL1) += 3c501.o

obj-$(CONFIG_EL16) += 3c507.o

obj-$(CONFIG_ELMC) += 3c523.o

drivers/net/Space.c

+0 −6
Original line number Diff line number Diff line
@@ -210,9 +210,6 @@ static struct devprobe2 isa_probes[] __initdata = { 
#ifdef CONFIG_AT1700

	{at1700_probe, 0},

#endif

#ifdef CONFIG_FMV18X		/* Fujitsu FMV-181/182 */

	{fmv18x_probe, 0},

#endif

#ifdef CONFIG_ETH16I

	{eth16i_probe, 0},	/* ICL EtherTeam 16i/32 */

#endif
@@ -243,9 +240,6 @@ static struct devprobe2 isa_probes[] __initdata = { 
#ifdef CONFIG_ELPLUS		/* 3c505 */

	{elplus_probe, 0},

#endif

#ifdef CONFIG_SK_G16

	{SK_init, 0},

#endif

#ifdef CONFIG_NI5010

	{ni5010_probe, 0},

#endif