From 4aafe16c47f5ba6e9db24d5f2f7f5f0c6ce28f8c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 17 May 2006 14:37:04 -0700 Subject: [PATCH] --- yaml --- r: 26821 b: refs/heads/master c: 2d2a387199bf38c6628adb9c6184d7ab6e306148 h: refs/heads/master i: 26819: 68d47b7e6bd927df2e71d4f8b59304b45417a342 v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 3 +-- trunk/drivers/net/sky2.c | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 513f134c4aa1..b25bb9c72847 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee7abb04df92b444069be8fe47d66d809de23782 +refs/heads/master: 2d2a387199bf38c6628adb9c6184d7ab6e306148 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index a70c2b0cc104..63a6b3dfc095 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -78,8 +78,7 @@ static const struct pci_device_id skge_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE) }, { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU) }, { PCI_DEVICE(PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE510T), }, - { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) }, - { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) }, /* DGE-530T */ { 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) }, diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 277c57b3df9c..795adfad18bf 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -105,6 +105,7 @@ MODULE_PARM_DESC(idle_timeout, "Idle timeout workaround for lost interrupts (ms) static const struct pci_device_id sky2_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) }, /* DGE-560T */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) },