summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton2005-07-27 09:07:11 +0200
committerGreg Kroah-Hartman2005-09-08 23:57:24 +0200
commit8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531 (patch)
treebe78aa954e7062d55afd3bca108e272944ea1580
parent[PATCH] PCI: remove CONFIG_PCI_NAMES (diff)
downloadkernel-qcow2-linux-8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531.tar.gz
kernel-qcow2-linux-8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531.tar.xz
kernel-qcow2-linux-8fdc23ee1ab7c1f8f1dd40602f62b9cc84072531.zip
[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>
-rw-r--r--arch/ppc/kernel/pci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 7b3586a3bf30..854e45beb387 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);