summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sun/sungem.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 15:24:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 20:16:55 +0100
commitf73d12bd298f9614d8600326e9bd1f7871fcde4b (patch)
tree736c67ac825f2576b6d3a703defd1859e13787eb /drivers/net/ethernet/sun/sungem.c
parentnet/sgi: remove __dev* attributes (diff)
downloadlinux-f73d12bd298f9614d8600326e9bd1f7871fcde4b.tar.xz
linux-f73d12bd298f9614d8600326e9bd1f7871fcde4b.zip
net/sun: 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/sun/sungem.c')
-rw-r--r--drivers/net/ethernet/sun/sungem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 6c8695ec7cb9..c7bc0561b8eb 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -77,7 +77,7 @@
#define DRV_VERSION "1.0"
#define DRV_AUTHOR "David S. Miller <davem@redhat.com>"
-static char version[] __devinitdata =
+static char version[] =
DRV_NAME ".c:v" DRV_VERSION " " DRV_AUTHOR "\n";
MODULE_AUTHOR(DRV_AUTHOR);
@@ -2763,7 +2763,7 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
}
#endif /* not Sparc and not PPC */
-static int __devinit gem_get_device_address(struct gem *gp)
+static int gem_get_device_address(struct gem *gp)
{
#if defined(CONFIG_SPARC) || defined(CONFIG_PPC_PMAC)
struct net_device *dev = gp->dev;
@@ -2827,7 +2827,7 @@ static const struct net_device_ops gem_netdev_ops = {
#endif
};
-static int __devinit gem_init_one(struct pci_dev *pdev,
+static int gem_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
unsigned long gemreg_base, gemreg_len;