summaryrefslogtreecommitdiff
path: root/include/linux/pci_ids.h
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2006-05-23 06:10:15 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-24 00:27:31 -0400
commit0da34b6dfe55810ae60db57e08e2af8a808c0a55 (patch)
tree4a62f33ee86aba9245bd1356b64a5e797cfde967 /include/linux/pci_ids.h
parent3a720d726a6aa0a7cd9190f694587adf7bafdf4f (diff)
downloadlwn-0da34b6dfe55810ae60db57e08e2af8a808c0a55.tar.gz
lwn-0da34b6dfe55810ae60db57e08e2af8a808c0a55.zip
[PATCH] Add Myri-10G Ethernet driver
Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Andrew J. Gallatin <gallatin@myri.com> drivers/net/Kconfig | 17 drivers/net/Makefile | 1 drivers/net/myri10ge/Makefile | 5 drivers/net/myri10ge/myri10ge.c | 2851 +++++++++++++++ drivers/net/myri10ge/myri10ge_mcp.h | 205 + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 58 include/linux/pci_ids.h | 1 7 files changed, 3138 insertions(+) Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r--include/linux/pci_ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 563eeadbea46..151549a69ee0 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1827,6 +1827,7 @@
#define PCI_VENDOR_ID_SAMSUNG 0x144d
+#define PCI_VENDOR_ID_MYRICOM 0x14c1
#define PCI_VENDOR_ID_TITAN 0x14D2
#define PCI_DEVICE_ID_TITAN_010L 0x8001