diff options
| author | Andi Kleen | 2012-10-04 17:11:55 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-06 03:04:42 +0900 |
| commit | c477ebd89db4f53b380b6ba70d25e055e0aa2739 (patch) | |
| tree | 263acb6c824a8c357ef8baecc72f6fc845e5d17a /drivers/net/ethernet/dec/tulip/eeprom.c | |
| 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/dec/tulip/eeprom.c')
| -rw-r--r-- | drivers/net/ethernet/dec/tulip/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c index ed7d1dcd9566..44f7e8e82d85 100644 --- a/drivers/net/ethernet/dec/tulip/eeprom.c +++ b/drivers/net/ethernet/dec/tulip/eeprom.c @@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = { {NULL}}; -static const char *block_name[] __devinitdata = { +static const char *const block_name[] __devinitconst = { "21140 non-MII", "21140 MII PHY", "21142 Serial PHY", |