aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smc-mca.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/smc-mca.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/smc-mca.c')
-rw-r--r--drivers/net/smc-mca.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index c791ef76c1d6..a93f122e9a96 100644
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -268,9 +268,9 @@ static int __init ultramca_probe(struct device *gen_dev)
268 } 268 }
269 } 269 }
270 270
271 if(!tirq || !tbase 271 if(!tirq || !tbase ||
272 || (irq && irq != tirq) 272 (irq && irq != tirq) ||
273 || (base_addr && tbase != base_addr)) 273 (base_addr && tbase != base_addr))
274 /* FIXME: we're trying to force the ordering of the 274 /* FIXME: we're trying to force the ordering of the
275 * devices here, there should be a way of getting this 275 * devices here, there should be a way of getting this
276 * to happen */ 276 * to happen */