From 99ff8ee1f9fe0eb4d418ed2d253bb97ba51f65fa Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:24:00 -0500 Subject: [PATCH] --- yaml --- r: 341823 b: refs/heads/master c: 03c4d832a2a752120d18567c27812d53ab176e6e h: refs/heads/master i: 341821: 6108e783127431ddab9df91e4e60edf77a23d19c 341819: 5afba02262fb476037a647db7d67c248e0a4145b 341815: 9f54bddf59f1f713d0de650d306533552bc593ea 341807: cd22752acbcf80c94d65804b17d5fd29f26c47ec 341791: 7d745779cb6607d54478b2f0c7fe5fcd644b9a26 341759: bbd7c7545df1a1a53a7c9e1bc8eaebb034559ca5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/pasemi/pasemi_mac.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0c3d63fa2087..e2814472e0d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 654b8c5ce3b32403a915dfd41d92ad3118c3406e +refs/heads/master: 03c4d832a2a752120d18567c27812d53ab176e6e diff --git a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c b/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c index 6fa74d530e44..0be5844d6372 100644 --- a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c @@ -1727,7 +1727,7 @@ static const struct net_device_ops pasemi_netdev_ops = { #endif }; -static int __devinit +static int pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct net_device *dev; @@ -1849,7 +1849,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } -static void __devexit pasemi_mac_remove(struct pci_dev *pdev) +static void pasemi_mac_remove(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); struct pasemi_mac *mac; @@ -1884,7 +1884,7 @@ static struct pci_driver pasemi_mac_driver = { .name = "pasemi_mac", .id_table = pasemi_mac_pci_tbl, .probe = pasemi_mac_probe, - .remove = __devexit_p(pasemi_mac_remove), + .remove = pasemi_mac_remove, }; static void __exit pasemi_mac_cleanup_module(void)