diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/net/3c59x.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index af301f09d674..df42e28cc80f 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -851,6 +851,7 @@ static struct eisa_device_id vortex_eisa_ids[] = { | |||
| 851 | { "TCM5970", CH_3C597 }, | 851 | { "TCM5970", CH_3C597 }, |
| 852 | { "" } | 852 | { "" } |
| 853 | }; | 853 | }; |
| 854 | MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids); | ||
| 854 | 855 | ||
| 855 | static int vortex_eisa_probe(struct device *device); | 856 | static int vortex_eisa_probe(struct device *device); |
| 856 | static int vortex_eisa_remove(struct device *device); | 857 | static int vortex_eisa_remove(struct device *device); |