aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2005-08-24 01:14:23 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-08-27 04:41:01 -0400
commit86f0cd505781e42000763821ec6f70127a6abaae (patch)
treee6b02e8ee3461a80f8334bcf3a815bd5c51af07f /drivers/net/skge.c
parent815f62bf742718458ba822a7e1f51f285eb997f2 (diff)
downloadkernel_samsung_smdk4412-86f0cd505781e42000763821ec6f70127a6abaae.zip
kernel_samsung_smdk4412-86f0cd505781e42000763821ec6f70127a6abaae.tar.gz
kernel_samsung_smdk4412-86f0cd505781e42000763821ec6f70127a6abaae.tar.bz2
[PATCH] r8169: avoid conflict between revisions 2 and 3 of the Linksys EG1032
Both revisions share the same PCI device ID and vendor ID but revision 2 of the device uses SysKonnect's chipset whereas revision 3 of the device uses Realtek's 8169 chipset. Credit goes to Christiaan Lutzer <mythtv.lutzer@gmail.com> for reporting the issue and giving the actual value for the different revisions. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 48a43b8..d7c9851 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -79,8 +79,8 @@ static const struct pci_device_id skge_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */
{ PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) },
- { PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1032) },
{ PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1064) },
+ { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0015, },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, skge_id_table);