Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / tokenring / 3c359.c

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index ff32bef..b6162fe 100644 (file)
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -304,7 +304,7 @@ static int __devinit xl_probe(struct pci_dev *pdev,
 
        if ((i = pci_request_regions(pdev,"3c359"))) { 
                return i ; 
-       } ; 
+       }
 
        /* 
         * Allowing init_trdev to allocate the private data will align
@@ -1773,7 +1773,9 @@ static void xl_wait_misr_flags(struct net_device *dev)
        if (readb(xl_mmio + MMIO_MACDATA) != 0) {  /* Misr not clear */
                for (i=0; i<6; i++) { 
                        writel(MEM_BYTE_READ | 0xDFFE0 | i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                       while (readb(xl_mmio + MMIO_MACDATA) != 0 ) {} ; /* Empty Loop */
+                       while (readb(xl_mmio + MMIO_MACDATA) != 0) {
+                               ;       /* Empty Loop */
+                       }
                } 
        }