From: Andrew Morton <akpm@osdl.org>
Date: Wed, 27 Jul 2005 07:07:11 +0000 (-0700)
Subject: [PATCH] PCI: fix up pretty-names removal patch
X-Git-Tag: v2.6.14-rc1~492^2~20^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531;p=linux-2.6-omap-h63xx.git

[PATCH] PCI: fix up pretty-names removal patch

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 7b3586a3bf3..854e45beb38 100644
--- a/arch/ppc/kernel/pci.c
+++ b/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);