diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-15 22:38:58 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-15 22:38:58 -0500 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/net/netx-eth.c | |
| parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
| parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/net/netx-eth.c')
| -rw-r--r-- | drivers/net/netx-eth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index b9bed82e1d21..b289a0a2b945 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c | |||
| @@ -401,6 +401,8 @@ static int netx_eth_drv_probe(struct platform_device *pdev) | |||
| 401 | priv->xmac_base = priv->xc->xmac_base; | 401 | priv->xmac_base = priv->xc->xmac_base; |
| 402 | priv->sram_base = priv->xc->sram_base; | 402 | priv->sram_base = priv->xc->sram_base; |
| 403 | 403 | ||
| 404 | spin_lock_init(&priv->lock); | ||
| 405 | |||
| 404 | ret = pfifo_request(PFIFO_MASK(priv->id)); | 406 | ret = pfifo_request(PFIFO_MASK(priv->id)); |
| 405 | if (ret) { | 407 | if (ret) { |
| 406 | printk("unable to request PFIFO\n"); | 408 | printk("unable to request PFIFO\n"); |