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/adaptec | |
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/adaptec')
-rw-r--r-- | drivers/net/ethernet/adaptec/starfire.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index d920a529ba22..5b65992c2a0a 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c | |||
@@ -295,7 +295,7 @@ MODULE_DEVICE_TABLE(pci, starfire_pci_tbl); | |||
295 | static const struct chip_info { | 295 | static const struct chip_info { |
296 | const char *name; | 296 | const char *name; |
297 | int drv_flags; | 297 | int drv_flags; |
298 | } netdrv_tbl[] __devinitdata = { | 298 | } netdrv_tbl[] __devinitconst = { |
299 | { "Adaptec Starfire 6915", CanHaveMII }, | 299 | { "Adaptec Starfire 6915", CanHaveMII }, |
300 | }; | 300 | }; |
301 | 301 | ||