summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dlink
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-05 02:11:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 20:04:42 +0200
commitc477ebd89db4f53b380b6ba70d25e055e0aa2739 (patch)
tree263acb6c824a8c357ef8baecc72f6fc845e5d17a /drivers/net/ethernet/dlink
parentsections: fix section conflicts in drivers/mmc (diff)
downloadlinux-c477ebd89db4f53b380b6ba70d25e055e0aa2739.tar.xz
linux-c477ebd89db4f53b380b6ba70d25e055e0aa2739.zip
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/dlink')
-rw-r--r--drivers/net/ethernet/dlink/sundance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index d7bb52a7bda1..3b83588e51f6 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -218,7 +218,7 @@ enum {
struct pci_id_info {
const char *name;
};
-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
{"D-Link DFE-550TX FAST Ethernet Adapter"},
{"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
{"D-Link DFE-580TX 4 port Server Adapter"},