diff --git a/[refs] b/[refs] index 48084301eda5..7bef99e288c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68763c890eb2a60f9b50a061502f94e0cf20fdfe +refs/heads/master: 87e609760b5304ef0c0c53cf4d0b29fde9812e1b diff --git a/trunk/drivers/net/ll_temac_main.c b/trunk/drivers/net/ll_temac_main.c index e2c2a7202dba..183765cb7f25 100644 --- a/trunk/drivers/net/ll_temac_main.c +++ b/trunk/drivers/net/ll_temac_main.c @@ -952,7 +952,7 @@ static const struct attribute_group temac_attr_group = { .attrs = temac_device_attrs, }; -static int __init +static int __devinit temac_of_probe(struct platform_device *op, const struct of_device_id *match) { struct device_node *np;