diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:42 -0400 |
| commit | c477ebd89db4f53b380b6ba70d25e055e0aa2739 (patch) | |
| tree | 263acb6c824a8c357ef8baecc72f6fc845e5d17a /drivers/net/ethernet/dlink | |
| parent | 6cfe1093ca8ddfc0e50748d370c268aeabf371aa (diff) | |
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.c | 2 |
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 { | |||
| 218 | struct pci_id_info { | 218 | struct pci_id_info { |
| 219 | const char *name; | 219 | const char *name; |
| 220 | }; | 220 | }; |
| 221 | static const struct pci_id_info pci_id_tbl[] __devinitdata = { | 221 | static const struct pci_id_info pci_id_tbl[] __devinitconst = { |
| 222 | {"D-Link DFE-550TX FAST Ethernet Adapter"}, | 222 | {"D-Link DFE-550TX FAST Ethernet Adapter"}, |
| 223 | {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"}, | 223 | {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"}, |
| 224 | {"D-Link DFE-580TX 4 port Server Adapter"}, | 224 | {"D-Link DFE-580TX 4 port Server Adapter"}, |