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/3c501.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/3c501.c')
-rw-r--r-- | drivers/net/3c501.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c index 62ceb2b4820c..4d4cad393dce 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c | |||
@@ -249,11 +249,11 @@ static int __init el1_probe1(struct net_device *dev, int ioaddr) | |||
249 | * for the Sager NP943 prefix. | 249 | * for the Sager NP943 prefix. |
250 | */ | 250 | */ |
251 | 251 | ||
252 | if (station_addr[0] == 0x02 && station_addr[1] == 0x60 | 252 | if (station_addr[0] == 0x02 && station_addr[1] == 0x60 && |
253 | && station_addr[2] == 0x8c) | 253 | station_addr[2] == 0x8c) |
254 | mname = "3c501"; | 254 | mname = "3c501"; |
255 | else if (station_addr[0] == 0x00 && station_addr[1] == 0x80 | 255 | else if (station_addr[0] == 0x00 && station_addr[1] == 0x80 && |
256 | && station_addr[2] == 0xC8) | 256 | station_addr[2] == 0xC8) |
257 | mname = "NP943"; | 257 | mname = "NP943"; |
258 | else { | 258 | else { |
259 | release_region(ioaddr, EL1_IO_EXTENT); | 259 | release_region(ioaddr, EL1_IO_EXTENT); |