summaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-18 05:39:23 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-18 05:39:23 -0400
commit9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (patch)
tree27907bbd653504d71ff47cb00bdf8cd61e82f126 /drivers/net/skge.c
parenta890b15c0990cc8d686edcc85f5fccde71ad5ce9 (diff)
parent4741c336d27dec3ea68a35659abb8dc82b142388 (diff)
downloadblackbird-op-linux-9e73972cef1c0961c78b0e0b61c4ecc275b29f04.tar.gz
blackbird-op-linux-9e73972cef1c0961c78b0e0b61c4ecc275b29f04.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 35dbf05c7f06..a70c2b0cc104 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -78,6 +78,8 @@ 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_MARVELL, 0x4320) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */
{ PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) },
OpenPOWER on IntegriCloud