diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-09 12:42:57 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-09 12:42:57 -0600 |
| commit | e4c8308c852e6b3fa49215052a5b9e99597dee99 (patch) | |
| tree | a44ef3377c17d69c2210e809ac2552540ce6f1fc /drivers/net/3c59x.c | |
| parent | c37f3c2749b53225d36faa5c583203c5f12ae15b (diff) | |
| parent | 626a96db11698119a67eeda130488e869aa6f14e (diff) | |
Merge branch 'ep93xx-dma' into spi/next
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 99f43d275442..8cc22568ebd3 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c @@ -901,14 +901,14 @@ static const struct dev_pm_ops vortex_pm_ops = { #endif /* !CONFIG_PM */ #ifdef CONFIG_EISA -static const struct eisa_device_id vortex_eisa_ids[] __devinitconst = { +static struct eisa_device_id vortex_eisa_ids[] = { { "TCM5920", CH_3C592 }, { "TCM5970", CH_3C597 }, { "" } }; MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids); -static int __devinit vortex_eisa_probe(struct device *device) +static int __init vortex_eisa_probe(struct device *device) { void __iomem *ioaddr; struct eisa_device *edev; |