---

yaml --- r: 15072 b: refs/heads/master c: 016cc85 h: refs/heads/master v: v3
git-mirror · Dec 12, 2005 · c9218cc · c9218cc
1 parent 5946427
commit c9218cc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20234989a8ae0ff418e2acdef72205fb7cb3f819
+refs/heads/master: 016cc85072944bfa03c5e4b587ae89588ce2e5df
diff --git a/trunk/drivers/net/pcnet32.c b/trunk/drivers/net/pcnet32.c
@@ -1251,12 +1251,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 
     if (memcmp(promaddr, dev->dev_addr, 6)
 	|| !is_valid_ether_addr(dev->dev_addr)) {
-#ifndef __powerpc__
 	if (is_valid_ether_addr(promaddr)) {
-#else
-	if (!is_valid_ether_addr(dev->dev_addr)
-	    && is_valid_ether_addr(promaddr)) {
-#endif
 	    if (pcnet32_debug & NETIF_MSG_PROBE) {
 		printk(" warning: CSR address invalid,\n");
 		printk(KERN_INFO "    using instead PROM address of");