diff --git a/[refs] b/[refs] index d34c5dea714f..819c92ad215f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3edd76caf4d1cda9cf84c5c6845f80f996f36081 +refs/heads/master: 83084fa39282e9230d590cc91544acb6638c89fa diff --git a/trunk/drivers/net/sunbmac.c b/trunk/drivers/net/sunbmac.c index fe3ac6f9ae89..0e4a88d16327 100644 --- a/trunk/drivers/net/sunbmac.c +++ b/trunk/drivers/net/sunbmac.c @@ -1075,7 +1075,7 @@ static const struct ethtool_ops bigmac_ethtool_ops = { .get_link = bigmac_get_link, }; -static int __init bigmac_ether_init(struct sbus_dev *qec_sdev) +static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev) { struct net_device *dev; static int version_printed;