diff options
| author | Brice Goglin <brice@myri.com> | 2006-05-23 06:10:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 00:27:31 -0400 |
| commit | 0da34b6dfe55810ae60db57e08e2af8a808c0a55 (patch) | |
| tree | 4a62f33ee86aba9245bd1356b64a5e797cfde967 /drivers/net/Makefile | |
| parent | 3a720d726a6aa0a7cd9190f694587adf7bafdf4f (diff) | |
| download | linux-3.10-0da34b6dfe55810ae60db57e08e2af8a808c0a55.tar.gz linux-3.10-0da34b6dfe55810ae60db57e08e2af8a808c0a55.tar.bz2 linux-3.10-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 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b01cc9a3cb1..1eced328750 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -192,6 +192,7 @@ obj-$(CONFIG_R8169) += r8169.o obj-$(CONFIG_AMD8111_ETH) += amd8111e.o obj-$(CONFIG_IBMVETH) += ibmveth.o obj-$(CONFIG_S2IO) += s2io.o +obj-$(CONFIG_MYRI10GE) += myri10ge/ obj-$(CONFIG_SMC91X) += smc91x.o obj-$(CONFIG_SMC911X) += smc911x.o obj-$(CONFIG_DM9000) += dm9000.o |