diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-06 07:54:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-06 07:54:40 +0100 |
| commit | 730c30ec646bd252a9448a66ecd51d794853513f (patch) | |
| tree | c0d413860f9d8bf37374f17cfabb4911143465d7 /drivers/net/netx-eth.c | |
| parent | tcp: move some parts from tcp_write_xmit (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-730c30ec646bd252a9448a66ecd51d794853513f.tar.xz linux-730c30ec646bd252a9448a66ecd51d794853513f.zip | |
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.c | 2 |
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) priv->xmac_base = priv->xc->xmac_base; priv->sram_base = priv->xc->sram_base; + spin_lock_init(&priv->lock); + ret = pfifo_request(PFIFO_MASK(priv->id)); if (ret) { printk("unable to request PFIFO\n"); |