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/sis | |
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/sis')
-rw-r--r-- | drivers/net/ethernet/sis/sis190.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c index 4613591b43e7..d8166012b7d4 100644 --- a/drivers/net/ethernet/sis/sis190.c +++ b/drivers/net/ethernet/sis/sis190.c | |||
@@ -1618,7 +1618,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, | |||
1618 | static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev, | 1618 | static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev, |
1619 | struct net_device *dev) | 1619 | struct net_device *dev) |
1620 | { | 1620 | { |
1621 | static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 }; | 1621 | static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 }; |
1622 | struct sis190_private *tp = netdev_priv(dev); | 1622 | struct sis190_private *tp = netdev_priv(dev); |
1623 | struct pci_dev *isa_bridge; | 1623 | struct pci_dev *isa_bridge; |
1624 | u8 reg, tmp8; | 1624 | u8 reg, tmp8; |