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/dl2k.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/dl2k.c')
-rw-r--r-- | drivers/net/dl2k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index a2f1860fdd16..2a8b6a7c0b87 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
@@ -163,8 +163,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
163 | strcmp (media[card_idx], "4") == 0) { | 163 | strcmp (media[card_idx], "4") == 0) { |
164 | np->speed = 100; | 164 | np->speed = 100; |
165 | np->full_duplex = 1; | 165 | np->full_duplex = 1; |
166 | } else if (strcmp (media[card_idx], "100mbps_hd") == 0 | 166 | } else if (strcmp (media[card_idx], "100mbps_hd") == 0 || |
167 | || strcmp (media[card_idx], "3") == 0) { | 167 | strcmp (media[card_idx], "3") == 0) { |
168 | np->speed = 100; | 168 | np->speed = 100; |
169 | np->full_duplex = 0; | 169 | np->full_duplex = 0; |
170 | } else if (strcmp (media[card_idx], "10mbps_fd") == 0 || | 170 | } else if (strcmp (media[card_idx], "10mbps_fd") == 0 || |