diff options
author | Krzysztof Halasa <khc@pm.waw.pl> | 2009-09-04 20:54:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-07 04:56:45 -0400 |
commit | 32e6a0c82e7a7991a02414d830f262e1f4db73e6 (patch) | |
tree | 633a0b94bae892142b4874efbf49dfe0dca79032 /drivers | |
parent | c190e3c8f6b22004b9cdc62ee5e7ba2fa5f74dc7 (diff) |
WAN: remove deprecated PCI_DEVICE_ID from PCI200SYN driver.
PCI200SYN has its own PCI subsystem device ID for 3+ years, now it's
time to remove the generic PLX905[02] ID from the driver. Anyone with
old EEPROM data will have to run the upgrade.
Having the generic PLX905[02] (PCI-local bus bridge) ID is harmful
as the driver tries to handle other devices based on these bridges.
Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wan/pci200syn.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c index e035d8c57e11..a52f29c72c33 100644 --- a/drivers/net/wan/pci200syn.c +++ b/drivers/net/wan/pci200syn.c | |||
@@ -360,15 +360,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, | |||
360 | " %u RX packets rings\n", ramsize / 1024, ramphys, | 360 | " %u RX packets rings\n", ramsize / 1024, ramphys, |
361 | pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers); | 361 | pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers); |
362 | 362 | ||
363 | if (pdev->subsystem_device == PCI_DEVICE_ID_PLX_9050) { | ||
364 | printk(KERN_ERR "Detected PCI200SYN card with old " | ||
365 | "configuration data.\n"); | ||
366 | printk(KERN_ERR "See <http://www.kernel.org/pub/" | ||
367 | "linux/utils/net/hdlc/pci200syn/> for update.\n"); | ||
368 | printk(KERN_ERR "The card will stop working with" | ||
369 | " future versions of Linux if not updated.\n"); | ||
370 | } | ||
371 | |||
372 | if (card->tx_ring_buffers < 1) { | 363 | if (card->tx_ring_buffers < 1) { |
373 | printk(KERN_ERR "pci200syn: RAM test failed\n"); | 364 | printk(KERN_ERR "pci200syn: RAM test failed\n"); |
374 | pci200_pci_remove_one(pdev); | 365 | pci200_pci_remove_one(pdev); |
@@ -427,8 +418,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, | |||
427 | 418 | ||
428 | static struct pci_device_id pci200_pci_tbl[] __devinitdata = { | 419 | static struct pci_device_id pci200_pci_tbl[] __devinitdata = { |
429 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, | 420 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, |
430 | PCI_DEVICE_ID_PLX_9050, 0, 0, 0 }, | ||
431 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, | ||
432 | PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 }, | 421 | PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 }, |
433 | { 0, } | 422 | { 0, } |
434 | }; | 423 | }; |