]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] r8169: avoid conflict between revisions 2 and 3 of the Linksys EG1032
authorFrancois Romieu <romieu@fr.zoreil.com>
Tue, 23 Aug 2005 23:14:23 +0000 (01:14 +0200)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 27 Aug 2005 08:41:01 +0000 (04:41 -0400)
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>
drivers/net/r8169.c
drivers/net/skge.c

index 2f9b3227243b32ec165fa9242a161ff06032e3ac..f0471d102e3c61bcfc6089c483009e52b2427cfb 100644 (file)
@@ -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,},
 };
 
index 48a43b84ea5f8733299a2d8e6a6adcc34cb780ca..d7c98515fdfdd55d91cdd3fb54b1ca252ce2ec09 100644 (file)
@@ -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);