diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-17 01:48:42 +0200 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-17 22:37:41 +0200 |
| commit | a5e371f61ad33c07b28e7c9b60c78d71fdd34e2a (patch) | |
| tree | 8306d4f347a91d39f01a87d5c44d8c3b1c10bc69 /drivers/net/Space.c | |
| parent | net/mlx4_en: num cores tx rings for every UP (diff) | |
| download | linux-a5e371f61ad33c07b28e7c9b60c78d71fdd34e2a.tar.xz linux-a5e371f61ad33c07b28e7c9b60c78d71fdd34e2a.zip | |
drivers/net: delete all code/drivers depending on CONFIG_MCA
The support for CONFIG_MCA is being removed, since the 20
year old hardware simply isn't capable of meeting today's
software demands on CPU and memory resources.
This commit removes any MCA specific net drivers, and removes
any MCA specific probe/support code from drivers that were
doing a dual ISA/MCA role.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 486e2dc366e0..e3f0faca98d0 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -133,22 +133,9 @@ static struct devprobe2 eisa_probes[] __initdata = { {NULL, 0}, }; -static struct devprobe2 mca_probes[] __initdata = { -#ifdef CONFIG_NE2_MCA - {ne2_probe, 0}, -#endif -#ifdef CONFIG_ELMC /* 3c523 */ - {elmc_probe, 0}, -#endif -#ifdef CONFIG_ELMC_II /* 3c527 */ - {mc32_probe, 0}, -#endif - {NULL, 0}, -}; - /* * ISA probes that touch addresses < 0x400 (including those that also - * look for EISA/PCI/MCA cards in addition to ISA cards). + * look for EISA/PCI cards in addition to ISA cards). */ static struct devprobe2 isa_probes[] __initdata = { #if defined(CONFIG_HP100) && defined(CONFIG_ISA) /* ISA, EISA */ @@ -278,7 +265,6 @@ static void __init ethif_probe2(int unit) (void)( probe_list2(unit, m68k_probes, base_addr == 0) && probe_list2(unit, eisa_probes, base_addr == 0) && - probe_list2(unit, mca_probes, base_addr == 0) && probe_list2(unit, isa_probes, base_addr == 0) && probe_list2(unit, parport_probes, base_addr == 0)); } |