summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion/s2io.h
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:23:18 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 11:16:44 -0800
commit3a036ce5c6fdd787d3146c639871668996221c0d (patch)
tree46e40e72398739af4d5ea081bdad1112db9ebac7 /drivers/net/ethernet/neterion/s2io.h
parent6980cbe4a6dbb3d7871e99a3cbc74a572d14d327 (diff)
downloadtalos-op-linux-3a036ce5c6fdd787d3146c639871668996221c0d.tar.gz
talos-op-linux-3a036ce5c6fdd787d3146c639871668996221c0d.zip
vxge/s2io: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Jon Mason <jdmason@kudzu.us> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/neterion/s2io.h')
-rw-r--r--drivers/net/ethernet/neterion/s2io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.h b/drivers/net/ethernet/neterion/s2io.h
index d5596926a1ef..032f9b6d850d 100644
--- a/drivers/net/ethernet/neterion/s2io.h
+++ b/drivers/net/ethernet/neterion/s2io.h
@@ -1075,9 +1075,9 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
/*
* Prototype declaration.
*/
-static int __devinit s2io_init_nic(struct pci_dev *pdev,
+static int s2io_init_nic(struct pci_dev *pdev,
const struct pci_device_id *pre);
-static void __devexit s2io_rem_nic(struct pci_dev *pdev);
+static void s2io_rem_nic(struct pci_dev *pdev);
static int init_shared_mem(struct s2io_nic *sp);
static void free_shared_mem(struct s2io_nic *sp);
static int init_nic(struct s2io_nic *nic);
OpenPOWER on IntegriCloud