From 3c2eb5cc1151dc48535f33db088747c58728ebdf Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 27 Jul 2005 00:07:11 -0700
Subject: [PATCH] --- yaml --- r: 7904 b: refs/heads/master c:
 8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/ppc/kernel/pci.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c660915f9c1f..cd9f0d8b7bb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 982245f01734e9d5a3ab98b2b2e9761ae7719094
+refs/heads/master: 8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531
diff --git a/trunk/arch/ppc/kernel/pci.c b/trunk/arch/ppc/kernel/pci.c
index 7b3586a3bf30..854e45beb387 100644
--- a/trunk/arch/ppc/kernel/pci.c
+++ b/trunk/arch/ppc/kernel/pci.c
@@ -80,7 +80,6 @@ fixup_broken_pcnet32(struct pci_dev* dev)
 	if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
 		dev->vendor = PCI_VENDOR_ID_AMD;
 		pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);
-		pci_name_device(dev);
 	}
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT,	PCI_ANY_ID,			fixup_broken_pcnet32);