net/intel: remove __dev* attributes

[~andy/linux] / drivers / net / ethernet / intel / e100.c

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 29ce9bd27f94ea21490f5b6c626d5a709a05ccd9..50c20509862694e14c2b14c8eb29a1837efa0f51 100644 (file)
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2829,7 +2829,7 @@ static const struct net_device_ops e100_netdev_ops = {
        .ndo_set_features       = e100_set_features,
 };
 
-static int __devinit e100_probe(struct pci_dev *pdev,
+static int e100_probe(struct pci_dev *pdev,
        const struct pci_device_id *ent)
 {
        struct net_device *netdev;
@@ -2981,7 +2981,7 @@ err_out_free_dev:
        return err;
 }
 
-static void __devexit e100_remove(struct pci_dev *pdev)
+static void e100_remove(struct pci_dev *pdev)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
 
@@ -3167,7 +3167,7 @@ static struct pci_driver e100_driver = {
        .name =         DRV_NAME,
        .id_table =     e100_id_table,
        .probe =        e100_probe,
-       .remove =       __devexit_p(e100_remove),
+       .remove =       e100_remove,
 #ifdef CONFIG_PM
        /* Power Management hooks */
        .suspend =      e100_suspend,