summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/sb1250-mac.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-12-03 15:35:28 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-03 15:35:28 -0500
commit682d7978aee072f411fc747d32954a8371dd7b1b (patch)
treeeeda0abd33caeb14d0adbc5ffd2a9a8cbb4b2ac8 /drivers/net/ethernet/broadcom/sb1250-mac.c
parenta5a81f0b9025867efb999d14a8dfc1907c5a4c3b (diff)
parent9f9a12f8ca79839c948464a37c5b557808278708 (diff)
Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/net-next
Networking: Remove __dev* markings from the networking drivers This is a series of patches that remove the dev* attributes for all networking drivers, with the exception of wireless drivers, those are in a different branch. Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit are no longer needed since CONFIG_HOTPLUG is being removed as an option. Note, there are some devinit compiler section mismatch warnings due to this series, but they are fixed up when merged with my driver-next branch, which fixes the PCI device id warnings, and removes the modpost detection, as it's no longer needed. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/sb1250-mac.c')
-rw-r--r--drivers/net/ethernet/broadcom/sb1250-mac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index 49e7a258da8..3a1c8a3cf7c 100644
--- a/drivers/net/ethernet/broadcom/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -2586,7 +2586,7 @@ static int sbmac_poll(struct napi_struct *napi, int budget)
}
-static int __devinit sbmac_probe(struct platform_device *pldev)
+static int sbmac_probe(struct platform_device *pldev)
{
struct net_device *dev;
struct sbmac_softc *sc;