From c9218cc17f93635fa43980df54bfd4b2c2b72306 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olh@suse.de>
Date: Fri, 9 Dec 2005 19:12:10 +0100
Subject: [PATCH] --- yaml --- r: 15072 b: refs/heads/master c:
 016cc85072944bfa03c5e4b587ae89588ce2e5df h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/pcnet32.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1f2d00fa1573..a03f0d1de838 100644
--- 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
index be319229f543..8f6cf8c896a4 100644
--- 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");