diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-06-03 02:43:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 02:43:41 -0700 |
| commit | b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch) | |
| tree | 71ae1801d264bca62efa0d22376b49de7f206e9a /drivers/net/3c509.c | |
| parent | mlx4_en: Updated driver version (diff) | |
| parent | net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup (diff) | |
| download | linux-dev-b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768.tar.xz linux-dev-b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/forcedeth.c
Diffstat (limited to 'drivers/net/3c509.c')
| -rw-r--r-- | drivers/net/3c509.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 8d9aa49de145..d2137efbd455 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c @@ -480,9 +480,13 @@ static int pnp_registered; #ifdef CONFIG_EISA static struct eisa_device_id el3_eisa_ids[] = { + { "TCM5090" }, + { "TCM5091" }, { "TCM5092" }, { "TCM5093" }, + { "TCM5094" }, { "TCM5095" }, + { "TCM5098" }, { "" } }; MODULE_DEVICE_TABLE(eisa, el3_eisa_ids); |