aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netx-eth.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-06 01:54:40 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-06 01:54:40 -0500
commit730c30ec646bd252a9448a66ecd51d794853513f (patch)
treec0d413860f9d8bf37374f17cfabb4911143465d7 /drivers/net/netx-eth.c
parent726e07a8a38168266ac95d87736f9501a2d9e7b2 (diff)
parent0a0755c9fe47dc9f8271935909c66096e43efbfe (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-sta.c
Diffstat (limited to 'drivers/net/netx-eth.c')
-rw-r--r--drivers/net/netx-eth.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
index b418771f6811..1861d5bbd96b 100644
--- a/drivers/net/netx-eth.c
+++ b/drivers/net/netx-eth.c
@@ -400,6 +400,8 @@ static int netx_eth_drv_probe(struct platform_device *pdev)
400 priv->xmac_base = priv->xc->xmac_base; 400 priv->xmac_base = priv->xc->xmac_base;
401 priv->sram_base = priv->xc->sram_base; 401 priv->sram_base = priv->xc->sram_base;
402 402
403 spin_lock_init(&priv->lock);
404
403 ret = pfifo_request(PFIFO_MASK(priv->id)); 405 ret = pfifo_request(PFIFO_MASK(priv->id));
404 if (ret) { 406 if (ret) {
405 printk("unable to request PFIFO\n"); 407 printk("unable to request PFIFO\n");