summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/8390
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:11:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:42 +0900
commitc477ebd89db4f53b380b6ba70d25e055e0aa2739 (patch)
tree263acb6c824a8c357ef8baecc72f6fc845e5d17a /drivers/net/ethernet/8390
parent6cfe1093ca8ddfc0e50748d370c268aeabf371aa (diff)
downloadop-kernel-dev-c477ebd89db4f53b380b6ba70d25e055e0aa2739.zip
op-kernel-dev-c477ebd89db4f53b380b6ba70d25e055e0aa2739.tar.gz
sections: fix section conflicts in drivers/net
Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/ethernet/8390')
-rw-r--r--drivers/net/ethernet/8390/ne3210.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/8390/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
index a2f8b2b..e3f5742 100644
--- a/drivers/net/ethernet/8390/ne3210.c
+++ b/drivers/net/ethernet/8390/ne3210.c
@@ -81,7 +81,7 @@ static void ne3210_block_output(struct net_device *dev, int count, const unsigne
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 const char * const ifmap[] __initconst = {"UTP", "?", "BNC", "AUI"};
static int ifmap_val[] __initdata = {
IF_PORT_10BASET,
IF_PORT_UNKNOWN,
OpenPOWER on IntegriCloud