From akpm@osdl.org Wed Jul 27 00:11:39 2005
Message-Id: <200507270708.j6R787Gt007450@shell0.pdx.osdl.net>
Subject: PCI: fix up pretty-names removal patch
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 27 Jul 2005 00:07:11 -0700


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

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

--- gregkh-2.6.orig/arch/ppc/kernel/pci.c	2005-07-13 09:45:00.000000000 -0700
+++ gregkh-2.6/arch/ppc/kernel/pci.c	2005-07-27 22:33:51.000000000 -0700
@@ -80,7 +80,6 @@
 	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);