diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/hp100.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (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/hp100.c')
-rw-r--r-- | drivers/net/hp100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index dd8665138062..90f890e7c5e1 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
@@ -993,8 +993,8 @@ static void hp100_mmuinit(struct net_device *dev) | |||
993 | if (lp->mode == 1) { /* only needed for Busmaster */ | 993 | if (lp->mode == 1) { /* only needed for Busmaster */ |
994 | int xmit_stop, recv_stop; | 994 | int xmit_stop, recv_stop; |
995 | 995 | ||
996 | if ((lp->chip == HP100_CHIPID_RAINIER) | 996 | if ((lp->chip == HP100_CHIPID_RAINIER) || |
997 | || (lp->chip == HP100_CHIPID_SHASTA)) { | 997 | (lp->chip == HP100_CHIPID_SHASTA)) { |
998 | int pdl_stop; | 998 | int pdl_stop; |
999 | 999 | ||
1000 | /* | 1000 | /* |