diff --git a/[refs] b/[refs] index 6cc1cfd1d7aa..1f5aeb9d100a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25442e06d20aaba7d7b16438078a562b3e4cf19b +refs/heads/master: ade2d3db21b0625f9528bcd6f1656dd7c8d0fe08 diff --git a/trunk/drivers/net/mipsnet.c b/trunk/drivers/net/mipsnet.c index 8e9704f5c122..869f0ea43a5b 100644 --- a/trunk/drivers/net/mipsnet.c +++ b/trunk/drivers/net/mipsnet.c @@ -247,7 +247,7 @@ static const struct net_device_ops mipsnet_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, }; -static int __init mipsnet_probe(struct platform_device *dev) +static int __devinit mipsnet_probe(struct platform_device *dev) { struct net_device *netdev; int err;