diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 18:58:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 18:58:18 +0100 |
| commit | 6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f (patch) | |
| tree | f1324a39f155375221ed88db0626f61b75c51db6 /drivers/net/sh_eth.c | |
| parent | ASoC: Store DC offset correction for wm_hubs devices in class W mode (diff) | |
| parent | ASoC: Include cx20442 to SND_SOC_ALL_CODECS (diff) | |
| download | linux-6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f.tar.xz linux-6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'drivers/net/sh_eth.c')
| -rw-r--r-- | drivers/net/sh_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index f5a9eb1df593..79fd02bc69fd 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -1437,7 +1437,7 @@ static const struct net_device_ops sh_eth_netdev_ops = { static int sh_eth_drv_probe(struct platform_device *pdev) { - int ret, i, devno = 0; + int ret, devno = 0; struct resource *res; struct net_device *ndev = NULL; struct sh_eth_private *mdp; |