Commit 4228c394 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

make legacy ISA probe optional 



There are very few ISA drivers left that rely on the static probing from
drivers/net/Space.o. Make them all select a new CONFIG_NETDEV_LEGACY_INIT
symbol, and drop the entire probe logic when that is disabled.

The 9 drivers that are called from Space.c are the same set that
calls netdev_boot_setup_check().

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ea2f5ff

drivers/net/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -606,4 +606,11 @@ config NET_FAILOVER 
	  a VM with direct attached VF by failing over to the paravirtual

	  datapath when the VF is unplugged.



config NETDEV_LEGACY_INIT

	bool

	depends on ISA

	help

	  Drivers that call netdev_boot_setup_check() should select this

	  symbol, everything else no longer needs it.



endif # NETDEVICES

drivers/net/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ obj-$(CONFIG_MACVLAN) += macvlan.o 
obj-$(CONFIG_MACVTAP) += macvtap.o

obj-$(CONFIG_MII) += mii.o

obj-$(CONFIG_MDIO) += mdio.o

obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_NET) += loopback.o

obj-$(CONFIG_NETDEV_LEGACY_INIT) += Space.o

obj-$(CONFIG_NETCONSOLE) += netconsole.o

obj-y += phy/

obj-y += mdio/

drivers/net/appletalk/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -52,7 +52,9 @@ config LTPC 


config COPS

	tristate "COPS LocalTalk PC support"

	depends on DEV_APPLETALK && (ISA || EISA)

	depends on DEV_APPLETALK && ISA

	depends on NETDEVICES

	select NETDEV_LEGACY_INIT

	help

	  This allows you to use COPS AppleTalk cards to connect to LocalTalk

	  networks. You also need version 1.3.3 or later of the netatalk

drivers/net/ethernet/3com/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ config EL3 
config 3C515

	tristate "3c515 ISA \"Fast EtherLink\""

	depends on ISA && ISA_DMA_API && !PPC32

	select NETDEV_LEGACY_INIT

	help

	  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet

	  network card, say Y here.

drivers/net/ethernet/8390/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config MCF8390 
config NE2000

	tristate "NE2000/NE1000 support"

	depends on (ISA || (Q40 && m) || MACH_TX49XX || ATARI_ETHERNEC)

	select NETDEV_LEGACY_INIT if ISA

	select CRC32

	help

	  If you have a network (Ethernet) card of this type, say Y here.
@@ -169,6 +170,7 @@ config STNIC 
config ULTRA

	tristate "SMC Ultra support"

	depends on ISA

	select NETDEV_LEGACY_INIT

	select CRC32

	help

	  If you have a network (Ethernet) card of this type, say Y here.
@@ -186,6 +188,7 @@ config ULTRA 
config WD80x3

	tristate "WD80*3 support"

	depends on ISA

	select NETDEV_LEGACY_INIT

	select CRC32

	help

	  If you have a network (Ethernet) card of this type, say Y here.