diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/tokenring/madgemc.c linux-2.5/drivers/net/tokenring/madgemc.c
--- bk-linus/drivers/net/tokenring/madgemc.c	2002-11-21 02:17:05.000000000 +0000
+++ linux-2.5/drivers/net/tokenring/madgemc.c	2002-11-21 17:59:53.000000000 +0000
@@ -227,16 +227,12 @@ int __init madgemc_probe(void)
 			goto getout;
 		}
 
-		request_region(dev->base_addr, MADGEMC_IO_EXTENT, "madgemc");
-#if 0
-		/* why is this not working? */
-		if (request_region(dev->base_addr, MADGEMC_IO_EXTENT, 
+		if (!request_region(dev->base_addr, MADGEMC_IO_EXTENT, 
 				   "madgemc")) {
 			printk(KERN_INFO "madgemc: unable to setup Smart MC in slot %d because of I/O base conflict at 0x%04lx\n", slot, dev->base_addr);
 			dev->base_addr += MADGEMC_SIF_OFFSET;
 			goto getout;
 		}
-#endif
 		dev->base_addr += MADGEMC_SIF_OFFSET;
 		
 		/*