diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-04 16:51:58 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-04 16:51:58 -0800 |
commit | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch) | |
tree | bc3ef1b64dcdb48b2d6accb51951a0d73b33262e /drivers/net/pcmcia | |
parent | 4d7902f22b0804730b80f7a4147f676430248a3a (diff) | |
parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index c38ed777f0a..a6999403f37 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c @@ -586,7 +586,7 @@ static int pcnet_config(struct pcmcia_device *link) } if ((link->conf.ConfigBase == 0x03c0) - && (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) { + && (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) { printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n"); printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n"); goto failed; |