diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
| commit | 8244132ea89cdd128003f5b9980fab50d8d36d72 (patch) | |
| tree | c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95 /drivers/net/pcmcia/smc91c92_cs.c | |
| parent | 7b2ff18ee7b0ec4bc3162f821e221781aaca48bd (diff) | |
| parent | 38000a94a902e94ca8b5498f7871c6316de8957a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/net/pcmcia/smc91c92_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 7b6fe89f9db0..64e6a84bbbbe 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
| @@ -322,6 +322,7 @@ static int smc91c92_probe(struct pcmcia_device *link) | |||
| 322 | return -ENOMEM; | 322 | return -ENOMEM; |
| 323 | smc = netdev_priv(dev); | 323 | smc = netdev_priv(dev); |
| 324 | smc->p_dev = link; | 324 | smc->p_dev = link; |
| 325 | link->priv = dev; | ||
| 325 | 326 | ||
| 326 | spin_lock_init(&smc->lock); | 327 | spin_lock_init(&smc->lock); |
| 327 | link->io.NumPorts1 = 16; | 328 | link->io.NumPorts1 = 16; |