From: Francois Romieu Date: Tue, 23 Aug 2005 23:14:23 +0000 (+0200) Subject: [PATCH] r8169: avoid conflict between revisions 2 and 3 of the Linksys EG1032 X-Git-Tag: v2.6.14-rc1~1055^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=86f0cd505781e42000763821ec6f70127a6abaae;p=linux-2.6-omap-h63xx.git [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 for reporting the issue and giving the actual value for the different revisions. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 2f9b3227243..f0471d102e3 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -186,8 +186,8 @@ const static struct { static struct pci_device_id rtl8169_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), }, { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), }, - { PCI_DEVICE(PCI_VENDOR_ID_LINKSYS, 0x1032), }, { PCI_DEVICE(0x16ec, 0x0116), }, + { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024, }, {0,}, }; diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 48a43b84ea5..d7c98515fdf 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);