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/tokenring | |
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/tokenring')
-rw-r--r-- | drivers/net/tokenring/madgemc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 1313aa1315f0..2bedc0ace812 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c @@ -727,7 +727,7 @@ static int __devexit madgemc_remove(struct device *device) return 0; } -static const short madgemc_adapter_ids[] __devinitconst = { +static short madgemc_adapter_ids[] __initdata = { 0x002d, 0x0000 }; |