From 1ff2727b0eaab9b131029e4fb4cf9cd3094daecd Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 8 Aug 2012 04:47:24 +0000 Subject: [PATCH] --- yaml --- r: 321579 b: refs/heads/master c: f5addb91d14e63beb6224a62fb81b6e610cee3bc h: refs/heads/master i: 321577: 4e8d8411553b9b060165a2658898fc7b2afd3609 321575: 4604d5815434a64bd18615d02cc8819fbbb7920b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df651f9a1f6b..a832fe9a065f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a32aea6e01b10a462763e0b0e00805f387ca010 +refs/heads/master: f5addb91d14e63beb6224a62fb81b6e610cee3bc diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index cd01ee7ecef1..b93245c11995 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -74,7 +74,7 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev, * the necessary resources and invokes the main to init * the net device, register the mdio bus etc. */ -static int stmmac_pltfr_probe(struct platform_device *pdev) +static int __devinit stmmac_pltfr_probe(struct platform_device *pdev) { int ret = 0; struct resource *res;