aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/pcnet_cs.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/pcmcia/pcnet_cs.c
parent3454f835837609d60b29a266e3bd9d701073b060 (diff)
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 469684474b72..347eaee855c0 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -601,8 +601,8 @@ static int pcnet_config(struct pcmcia_device *link)
601 dev->if_port = 0; 601 dev->if_port = 0;
602 } 602 }
603 603
604 if ((link->conf.ConfigBase == 0x03c0) 604 if ((link->conf.ConfigBase == 0x03c0) &&
605 && (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) { 605 (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
606 printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n"); 606 printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
607 printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n"); 607 printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
608 goto failed; 608 goto failed;