diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-31 19:27:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-31 19:28:32 -0700 |
| commit | 948252cb9e01d65a89ecadf67be5018351eee15e (patch) | |
| tree | c26e0de3e2b938139f2673cff12520e100f0cd3b /drivers/net/ne3210.c | |
| parent | 930a6eac9f40e692bd9670d89bcd9ac0f4019356 (diff) | |
| download | op-kernel-dev-948252cb9e01d65a89ecadf67be5018351eee15e.zip op-kernel-dev-948252cb9e01d65a89ecadf67be5018351eee15e.tar.gz | |
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/ne3210.c')
| -rw-r--r-- | drivers/net/ne3210.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c index e8984b0c..243ed2a 100644 --- a/drivers/net/ne3210.c +++ b/drivers/net/ne3210.c @@ -80,20 +80,17 @@ static void ne3210_block_output(struct net_device *dev, int count, const unsigne #define NE3210_DEBUG 0x0 -static const unsigned char irq_map[] __devinitconst = - { 15, 12, 11, 10, 9, 7, 5, 3 }; -static const unsigned int shmem_map[] __devinitconst = - { 0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0 }; -static const char *const ifmap[] __devinitconst = - { "UTP", "?", "BNC", "AUI" }; -static const int ifmap_val[] __devinitconst = { +static unsigned char irq_map[] __initdata = {15, 12, 11, 10, 9, 7, 5, 3}; +static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0}; +static const char *ifmap[] __initdata = {"UTP", "?", "BNC", "AUI"}; +static int ifmap_val[] __initdata = { IF_PORT_10BASET, IF_PORT_UNKNOWN, IF_PORT_10BASE2, IF_PORT_AUI, }; -static int __devinit ne3210_eisa_probe (struct device *device) +static int __init ne3210_eisa_probe (struct device *device) { unsigned long ioaddr, phys_mem; int i, retval, port_index; @@ -316,7 +313,7 @@ static void ne3210_block_output(struct net_device *dev, int count, memcpy_toio(shmem, buf, count); } -static const struct eisa_device_id ne3210_ids[] __devinitconst = { +static struct eisa_device_id ne3210_ids[] = { { "EGL0101" }, { "NVL1801" }, { "" }, |
