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/ibmlana.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/ibmlana.c')
| -rw-r--r-- | drivers/net/ibmlana.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index 136d7544cc33..a7d6cad32953 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c @@ -895,12 +895,12 @@ static int ibmlana_irq; static int ibmlana_io; static int startslot; /* counts through slots when probing multiple devices */ -static const short ibmlana_adapter_ids[] __devinitconst = { +static short ibmlana_adapter_ids[] __initdata = { IBM_LANA_ID, 0x0000 }; -static const char *const ibmlana_adapter_names[] __devinitconst = { +static char *ibmlana_adapter_names[] __devinitdata = { "IBM LAN Adapter/A", NULL }; |