diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /drivers/net/sh_eth.c | |
| parent | 7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff) | |
| parent | a2acad8298a42b7be684a32fafaf83332bba9c2b (diff) | |
Merge branch 'fix/misc' into topic/misc
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 = { | |||
| 1437 | 1437 | ||
| 1438 | static int sh_eth_drv_probe(struct platform_device *pdev) | 1438 | static int sh_eth_drv_probe(struct platform_device *pdev) |
| 1439 | { | 1439 | { |
| 1440 | int ret, i, devno = 0; | 1440 | int ret, devno = 0; |
| 1441 | struct resource *res; | 1441 | struct resource *res; |
| 1442 | struct net_device *ndev = NULL; | 1442 | struct net_device *ndev = NULL; |
| 1443 | struct sh_eth_private *mdp; | 1443 | struct sh_eth_private *mdp; |