diff options
Diffstat (limited to 'drivers/net/ethernet/dec/tulip/uli526x.c')
-rw-r--r-- | drivers/net/ethernet/dec/tulip/uli526x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index 75d45f8a37dc..93845afe1cea 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c | |||
@@ -204,8 +204,8 @@ enum uli526x_CR6_bits { | |||
204 | }; | 204 | }; |
205 | 205 | ||
206 | /* Global variable declaration ----------------------------- */ | 206 | /* Global variable declaration ----------------------------- */ |
207 | static int __devinitdata printed_version; | 207 | static int printed_version; |
208 | static const char version[] __devinitconst = | 208 | static const char version[] = |
209 | "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")"; | 209 | "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")"; |
210 | 210 | ||
211 | static int uli526x_debug; | 211 | static int uli526x_debug; |
@@ -281,8 +281,8 @@ static const struct net_device_ops netdev_ops = { | |||
281 | * Search ULI526X board, allocate space and register it | 281 | * Search ULI526X board, allocate space and register it |
282 | */ | 282 | */ |
283 | 283 | ||
284 | static int __devinit uli526x_init_one (struct pci_dev *pdev, | 284 | static int uli526x_init_one(struct pci_dev *pdev, |
285 | const struct pci_device_id *ent) | 285 | const struct pci_device_id *ent) |
286 | { | 286 | { |
287 | struct uli526x_board_info *db; /* board information structure */ | 287 | struct uli526x_board_info *db; /* board information structure */ |
288 | struct net_device *dev; | 288 | struct net_device *dev; |
@@ -436,7 +436,7 @@ err_out_free: | |||
436 | } | 436 | } |
437 | 437 | ||
438 | 438 | ||
439 | static void __devexit uli526x_remove_one (struct pci_dev *pdev) | 439 | static void uli526x_remove_one(struct pci_dev *pdev) |
440 | { | 440 | { |
441 | struct net_device *dev = pci_get_drvdata(pdev); | 441 | struct net_device *dev = pci_get_drvdata(pdev); |
442 | struct uli526x_board_info *db = netdev_priv(dev); | 442 | struct uli526x_board_info *db = netdev_priv(dev); |
@@ -1788,7 +1788,7 @@ static struct pci_driver uli526x_driver = { | |||
1788 | .name = "uli526x", | 1788 | .name = "uli526x", |
1789 | .id_table = uli526x_pci_tbl, | 1789 | .id_table = uli526x_pci_tbl, |
1790 | .probe = uli526x_init_one, | 1790 | .probe = uli526x_init_one, |
1791 | .remove = __devexit_p(uli526x_remove_one), | 1791 | .remove = uli526x_remove_one, |
1792 | .suspend = uli526x_suspend, | 1792 | .suspend = uli526x_suspend, |
1793 | .resume = uli526x_resume, | 1793 | .resume = uli526x_resume, |
1794 | }; | 1794 | }; |