23a24
> 	"PCM100",			/* EtherFast Integrated 10/100 PC Card */
28a30
> 
35c37
< 	int i, slot;
---
> 	int i;
41c43
< 	 * Use defaults for port, irq, mem and size
---
> 	 * Use defaults for port, mem and size
48,49d49
< 	if(ether->irq == 0)
< 		ether->irq = 9;
56,58d55
< 	if(ioalloc(ether->port, 0x20, 0, "ec2t") < 0)
< 		return -1;
< 	slot = -1;
62c59
< 		if((slot = pcmspecial(type, ether)) >= 0)
---
> 		if(pcmgrep(type) >= 0)
65,77d61
< 	if(ec2tpcmcia[i] == nil){
< 		for(i = 0; i < ether->nopt; i++){
< 			if(cistrncmp(ether->opt[i], "id=", 3))
< 				continue;
< 			type = &ether->opt[i][3];
< 			if((slot = pcmspecial(type, ether)) >= 0)
< 				break;
< 		}
< 	}
< 	if(slot < 0){
< 		iofree(port);
< 		return -1;
< 	}
92,98d75
< 	for(i = 0; i < ether->nopt; i++){
< 		if(cistrcmp(ether->opt[i], "nodummyrr") == 0)
< 			ctlr->dummyrr = 0;
< 		else if(cistrncmp(ether->opt[i], "dummyrr=", 8) == 0)
< 			ctlr->dummyrr = strtol(&ether->opt[i][8], nil, 0);
< 	}
< 
119c96
< 	if(cistrcmp(type, "PCMPC100") == 0 || cistrcmp(type, "FA410TX") == 0){
---
> 	if(cistrcmp(type, "PCM100") == 0 || cistrcmp(type, "PCMPC100") == 0 || cistrcmp(type, "FA410TX") == 0){
137,138d113
< 		pcmspecialclose(slot);
< 		iofree(ether->port);