From: Andrew Morton <[email-masked]>

Cc: Greg KH <[email-masked]>
Signed-off-by: Andrew Morton <[email-masked]>
---

 arch/ppc/kernel/pci.c |    1 -
 1 files changed, 1 deletion(-)

diff -puN arch/ppc/kernel/pci.c~gregkh-pci-pci-remove-pretty-names-fix arch/ppc/kernel/pci.c
--- 25-ppc/arch/ppc/kernel/pci.c~gregkh-pci-pci-remove-pretty-names-fix	2005-07-27 00:05:15.000000000 -0700
+++ 25-ppc-akpm/arch/ppc/kernel/pci.c	2005-07-27 00:05:17.000000000 -0700
@@ -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);
_