X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fat1700.c;h=8725374811f58e6cbee57f0c56a3a13beb1856c7;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=a3e7e63c39a6a4710802d27e269fed41a977a552;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index a3e7e63c3..872537481 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -89,7 +89,7 @@ static unsigned at1700_probe_list[] __initdata = {
 /*
  *	MCA
  */
-#ifdef CONFIG_MCA_LEGACY
+#ifdef CONFIG_MCA	
 static int at1700_ioaddr_pattern[] __initdata = {
 	0x00, 0x04, 0x01, 0x05, 0x02, 0x06, 0x03, 0x07
 };
@@ -174,7 +174,7 @@ static void set_rx_mode(struct net_device *dev);
 static void net_tx_timeout (struct net_device *dev);
 
 
-#ifdef CONFIG_MCA_LEGACY
+#ifdef CONFIG_MCA
 struct at1720_mca_adapters_struct {
 	char* name;
 	int id;
@@ -202,7 +202,7 @@ static int irq;
 
 static void cleanup_card(struct net_device *dev)
 {
-#ifdef CONFIG_MCA_LEGACY
+#ifdef CONFIG_MCA	
 	struct net_local *lp = netdev_priv(dev);
 	if (lp->mca_slot >= 0)
 		mca_mark_as_unused(lp->mca_slot);
@@ -288,7 +288,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
 		   read_eeprom(ioaddr, 6), inw(ioaddr + EEPROM_Ctrl));
 #endif
 
-#ifdef CONFIG_MCA_LEGACY
+#ifdef CONFIG_MCA
 	/* rEnE (rene@bss.lu): got this from 3c509 driver source , adapted for AT1720 */
 
     /* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch, heavily
@@ -359,7 +359,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
 		goto err_out;
 	}
 			
-#ifdef CONFIG_MCA_LEGACY
+#ifdef CONFIG_MCA
 found:
 #endif
 
@@ -483,7 +483,7 @@ found:
 	return 0;
 
 err_mca:
-#ifdef CONFIG_MCA_LEGACY
+#ifdef CONFIG_MCA
 	if (slot >= 0)
 		mca_mark_as_unused(slot);
 #endif