aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/e100.c')
-rw-r--r--drivers/net/ethernet/intel/e100.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 29ce9bd27f94..a59f0779e1c3 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2829,8 +2829,7 @@ static const struct net_device_ops e100_netdev_ops = {
2829 .ndo_set_features = e100_set_features, 2829 .ndo_set_features = e100_set_features,
2830}; 2830};
2831 2831
2832static int __devinit e100_probe(struct pci_dev *pdev, 2832static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2833 const struct pci_device_id *ent)
2834{ 2833{
2835 struct net_device *netdev; 2834 struct net_device *netdev;
2836 struct nic *nic; 2835 struct nic *nic;
@@ -2981,7 +2980,7 @@ err_out_free_dev:
2981 return err; 2980 return err;
2982} 2981}
2983 2982
2984static void __devexit e100_remove(struct pci_dev *pdev) 2983static void e100_remove(struct pci_dev *pdev)
2985{ 2984{
2986 struct net_device *netdev = pci_get_drvdata(pdev); 2985 struct net_device *netdev = pci_get_drvdata(pdev);
2987 2986
@@ -3167,7 +3166,7 @@ static struct pci_driver e100_driver = {
3167 .name = DRV_NAME, 3166 .name = DRV_NAME,
3168 .id_table = e100_id_table, 3167 .id_table = e100_id_table,
3169 .probe = e100_probe, 3168 .probe = e100_probe,
3170 .remove = __devexit_p(e100_remove), 3169 .remove = e100_remove,
3171#ifdef CONFIG_PM 3170#ifdef CONFIG_PM
3172 /* Power Management hooks */ 3171 /* Power Management hooks */
3173 .suspend = e100_suspend, 3172 .suspend = e100_suspend,