drivers/net: Move && and || to end of previous line

[net-next-2.6.git] / drivers / net / tulip / pnic2.c

diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index 4e4a879c3fa56b500b5b2c05c22c35efc1b13b1e..d8418694bf466ded96824d76b926a9e4d9076c44 100644 (file)
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -1,7 +1,6 @@
 /*
        drivers/net/tulip/pnic2.c
 
-       Maintained by Valerie Henson <val_henson@linux.intel.com>
        Copyright 2000,2001  The Linux Kernel Team
        Written/copyright 1994-2001 by Donald Becker.
         Modified to hep support PNIC_II by Kevin B. Hendricks
@@ -10,9 +9,9 @@
        of the GNU General Public License, incorporated herein by reference.
 
        Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
-       for more information on this driver, or visit the project
-       Web page at http://sourceforge.net/projects/tulip/
+       for more information on this driver.
 
+        Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
 
@@ -317,9 +316,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
                }
        }
 
-       if ((tp->nwayset  &&  (csr5 & 0x08000000)
-                         && (dev->if_port == 3  ||  dev->if_port == 5)
-                         && (csr12 & 2) == 2) || (tp->nway && (csr5 & (TPLnkFail)))) {
+       if ((tp->nwayset  &&  (csr5 & 0x08000000) &&
+            (dev->if_port == 3  ||  dev->if_port == 5) &&
+            (csr12 & 2) == 2) || (tp->nway && (csr5 & (TPLnkFail)))) {
 
                /* Link blew? Maybe restart NWay. */