aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorManfred Spraul <manfred@colorfullife.com>2005-06-26 05:36:52 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 00:08:29 -0400
commitf49d16ef2d6f008119d4ee2c895781fb229bad68 (patch)
tree6c922b3b6d49f17563f0fd1f7ee67711f8e64813 /drivers
parent8f767fc83cf4e4f1241b5a0b949b54088d075411 (diff)
[PATCH] forcedeth: Add support for new device id
This is a multi-part message in MIME format.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/forcedeth.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index b471d1a8ffdc..64f0f697c958 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -84,6 +84,7 @@
84 * 0.32: 16 Apr 2005: RX_ERROR4 handling added. 84 * 0.32: 16 Apr 2005: RX_ERROR4 handling added.
85 * 0.33: 16 May 2005: Support for MCP51 added. 85 * 0.33: 16 May 2005: Support for MCP51 added.
86 * 0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics. 86 * 0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics.
87 * 0.35: 26 Jun 2005: Support for MCP55 added.
87 * 88 *
88 * Known bugs: 89 * Known bugs:
89 * We suspect that on some hardware no TX done interrupts are generated. 90 * We suspect that on some hardware no TX done interrupts are generated.
@@ -95,7 +96,7 @@
95 * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few 96 * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
96 * superfluous timer interrupts from the nic. 97 * superfluous timer interrupts from the nic.
97 */ 98 */
98#define FORCEDETH_VERSION "0.34" 99#define FORCEDETH_VERSION "0.35"
99#define DRV_NAME "forcedeth" 100#define DRV_NAME "forcedeth"
100 101
101#include <linux/module.h> 102#include <linux/module.h>
@@ -2284,6 +2285,20 @@ static struct pci_device_id pci_tbl[] = {
2284 .subdevice = PCI_ANY_ID, 2285 .subdevice = PCI_ANY_ID,
2285 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, 2286 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
2286 }, 2287 },
2288 { /* MCP55 Ethernet Controller */
2289 .vendor = PCI_VENDOR_ID_NVIDIA,
2290 .device = PCI_DEVICE_ID_NVIDIA_NVENET_14,
2291 .subvendor = PCI_ANY_ID,
2292 .subdevice = PCI_ANY_ID,
2293 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
2294 },
2295 { /* MCP55 Ethernet Controller */
2296 .vendor = PCI_VENDOR_ID_NVIDIA,
2297 .device = PCI_DEVICE_ID_NVIDIA_NVENET_15,
2298 .subvendor = PCI_ANY_ID,
2299 .subdevice = PCI_ANY_ID,
2300 .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
2301 },
2287 {0,}, 2302 {0,},
2288}; 2303};
2289 2304