diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
| commit | 7bbedd521310547ca73cc77adcf61fb85723adc3 (patch) | |
| tree | f759d90c46bfbc48a9f396c9c6f839da11cdc6aa /arch/ppc | |
| parent | f44702f49056c203341badaa2cb8a706160d9119 (diff) | |
| parent | a04ce0ffcaf561994ecf382cd3caad75556dc499 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/pci.c | 1 |
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) | |||
| 80 | if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) { | 80 | if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) { |
| 81 | dev->vendor = PCI_VENDOR_ID_AMD; | 81 | dev->vendor = PCI_VENDOR_ID_AMD; |
| 82 | pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD); | 82 | pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD); |
| 83 | pci_name_device(dev); | ||
| 84 | } | 83 | } |
| 85 | } | 84 | } |
| 86 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32); | 85 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32); |