[linuxsh-cvs] CVS: linux/drivers/net ne.c,1.11,1.12

[Paul M. <le...@us...>]

Update of /cvsroot/linuxsh/linux/drivers/net
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13203/drivers/net

Modified Files:
	ne.c 
Log Message:
Sanitize Renesas boards ifdefs in ne driver.



Index: ne.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/ne.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ne.c	2 Aug 2006 15:02:20 -0000	1.11
+++ ne.c	7 Aug 2006 05:19:44 -0000	1.12
@@ -196,11 +196,6 @@
 
 	SET_MODULE_OWNER(dev);
 
-#if defined(CONFIG_SH_RTS7751R2D) || defined(CONFIG_SH_R77703DRP) || defined(CONFIG_SH_R7780RP)
-	base_addr = AX88796L_IO_BASE;
-	dev->irq = IRQ_ONETH;
-#endif
-
 	/* First check any supplied i/o locations. User knows best. <cough> */
 	if (base_addr > 0x1ff)	/* Check a single specified location. */
 		return ne_probe1(dev, base_addr);
@@ -240,6 +235,13 @@
 	dev->base_addr = RBTX4938_RTL_8019_BASE;
 	dev->irq = RBTX4938_RTL_8019_IRQ;
 #endif
+
+#if defined(CONFIG_SH_RTS7751R2D) || defined(CONFIG_SH_R77703DRP) || \
+    defined(CONFIG_SH_R7780RP)
+	dev->base_addr = AX88796L_IO_BASE;
+	dev->irq = IRQ_ONETH;
+#endif
+
 	err = do_ne_probe(dev);
 	if (err)
 		goto out;
@@ -334,11 +336,7 @@
 	if (ei_debug  &&  version_printed++ == 0)
 		printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2);
 
-#if defined(CONFIG_SH_RTS7751R2D) || defined(CONFIG_SH_R77703DRP) || defined(CONFIG_SH_R7780RP)
-	printk(KERN_INFO "ASIX AX88796L ethercard probe at %#3x:", ioaddr);
-#else
 	printk(KERN_INFO "NE*000 ethercard probe at %#3x:", ioaddr);
-#endif
 
 	/* A user with a poor card that fails to ack the reset, or that
 	   does not have a valid 0x57,0x57 signature can still use this
@@ -451,11 +449,7 @@
 
 	/* Set up the rest of the parameters. */
 	if (neX000 || bad_card || copam) {
-#if defined(CONFIG_SH_RTS7751R2D) || defined(CONFIG_SH_R77703DRP) || defined(CONFIG_SH_R7780RP)
-		name = (wordlength == 2) ? "AX88796L" : "NE1000";
-#else
 		name = (wordlength == 2) ? "NE2000" : "NE1000";
-#endif
 	}
 	else if (ctron)
 	{