From 9f54bddf59f1f713d0de650d306533552bc593ea Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:23:52 -0500 Subject: [PATCH] --- yaml --- r: 341815 b: refs/heads/master c: 331774760a65c27c673aa7735075124978e7994b h: refs/heads/master i: 341813: 5aa8a5f86bc24591caa92d6bff627dde7ace23a5 341811: 01081f7b9fa87e5d3c92108ee92132a755c71fe1 341807: cd22752acbcf80c94d65804b17d5fd29f26c47ec v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/icplus/ipg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5f78c7358b47..92aa0b605f83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9871b639d00b75625a4bc855c09096e2c4897816 +refs/heads/master: 331774760a65c27c673aa7735075124978e7994b diff --git a/trunk/drivers/net/ethernet/icplus/ipg.c b/trunk/drivers/net/ethernet/icplus/ipg.c index 1b563bb959c2..f80ae745908d 100644 --- a/trunk/drivers/net/ethernet/icplus/ipg.c +++ b/trunk/drivers/net/ethernet/icplus/ipg.c @@ -2167,7 +2167,7 @@ static const struct ethtool_ops ipg_ethtool_ops = { .nway_reset = ipg_nway_reset, }; -static void __devexit ipg_remove(struct pci_dev *pdev) +static void ipg_remove(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); struct ipg_nic_private *sp = netdev_priv(dev); @@ -2199,7 +2199,7 @@ static const struct net_device_ops ipg_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static int __devinit ipg_probe(struct pci_dev *pdev, +static int ipg_probe(struct pci_dev *pdev, const struct pci_device_id *id) { unsigned int i = id->driver_data; @@ -2296,7 +2296,7 @@ static struct pci_driver ipg_pci_driver = { .name = IPG_DRIVER_NAME, .id_table = ipg_pci_tbl, .probe = ipg_probe, - .remove = __devexit_p(ipg_remove), + .remove = ipg_remove, }; static int __init ipg_init_module(void)