diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-01 04:27:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-01 04:28:32 +0200 |
| commit | 948252cb9e01d65a89ecadf67be5018351eee15e (patch) | |
| tree | c26e0de3e2b938139f2673cff12520e100f0cd3b /drivers/net/3c59x.c | |
| parent | drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run() (diff) | |
| download | linux-948252cb9e01d65a89ecadf67be5018351eee15e.tar.xz linux-948252cb9e01d65a89ecadf67be5018351eee15e.zip | |
Revert "net: fix section mismatches"
This reverts commit e5cb966c0838e4da43a3b0751bdcac7fe719f7b4.
It causes new build regressions with gcc-4.2 which is
pretty common on non-x86 platforms.
Reported-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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; |