diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-07-28 02:28:28 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-07-28 02:28:28 -0400 |
| commit | d3608b5681d238605b7da6be62244e803e24c649 (patch) | |
| tree | 1fc47e9f58e6e938eefd40904745a60986739bde /drivers/net/declance.c | |
| parent | 650fb4393dff543bc980d361555c489fbdeed088 (diff) | |
| parent | 113fc5a6e8c2288619ff7e8187a6f556b7e0d372 (diff) | |
Merge remote branch 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'drivers/net/declance.c')
| -rw-r--r-- | drivers/net/declance.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 1d973db27c32..d7de376d7178 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
| @@ -1022,7 +1022,7 @@ static const struct net_device_ops lance_netdev_ops = { | |||
| 1022 | .ndo_set_mac_address = eth_mac_addr, | 1022 | .ndo_set_mac_address = eth_mac_addr, |
| 1023 | }; | 1023 | }; |
| 1024 | 1024 | ||
| 1025 | static int __init dec_lance_probe(struct device *bdev, const int type) | 1025 | static int __devinit dec_lance_probe(struct device *bdev, const int type) |
| 1026 | { | 1026 | { |
| 1027 | static unsigned version_printed; | 1027 | static unsigned version_printed; |
| 1028 | static const char fmt[] = "declance%d"; | 1028 | static const char fmt[] = "declance%d"; |
| @@ -1326,7 +1326,7 @@ static void __exit dec_lance_platform_remove(void) | |||
| 1326 | } | 1326 | } |
| 1327 | 1327 | ||
| 1328 | #ifdef CONFIG_TC | 1328 | #ifdef CONFIG_TC |
| 1329 | static int __init dec_lance_tc_probe(struct device *dev); | 1329 | static int __devinit dec_lance_tc_probe(struct device *dev); |
| 1330 | static int __exit dec_lance_tc_remove(struct device *dev); | 1330 | static int __exit dec_lance_tc_remove(struct device *dev); |
| 1331 | 1331 | ||
| 1332 | static const struct tc_device_id dec_lance_tc_table[] = { | 1332 | static const struct tc_device_id dec_lance_tc_table[] = { |
| @@ -1345,7 +1345,7 @@ static struct tc_driver dec_lance_tc_driver = { | |||
| 1345 | }, | 1345 | }, |
| 1346 | }; | 1346 | }; |
| 1347 | 1347 | ||
| 1348 | static int __init dec_lance_tc_probe(struct device *dev) | 1348 | static int __devinit dec_lance_tc_probe(struct device *dev) |
| 1349 | { | 1349 | { |
| 1350 | int status = dec_lance_probe(dev, PMAD_LANCE); | 1350 | int status = dec_lance_probe(dev, PMAD_LANCE); |
| 1351 | if (!status) | 1351 | if (!status) |
