summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 09:55:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 09:55:21 -0700
commitf1f6ea352257e0df33cf0184ba777c293cb6f1d6 (patch)
treebff9547a1f45db619848c5de62033cb48e61c73b /drivers/net
parent63c70a0d7b59bac08bd14cd24c36f76aafc25de6 (diff)
parentb83156b52dd77979cc93bafc2283929532f6f7d0 (diff)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: avoid validate_cis failure on CIS override pcmcia: dev_node removal bugfix pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 7b6fe89f9db..64e6a84bbbb 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)
return -ENOMEM;
smc = netdev_priv(dev);
smc->p_dev = link;
+ link->priv = dev;
spin_lock_init(&smc->lock);
link->io.NumPorts1 = 16;