Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[safe/jmp/linux-2.6] / drivers / net / hp100.c

diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index dd86651..90f890e 100644 (file)
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -993,8 +993,8 @@ static void hp100_mmuinit(struct net_device *dev)
        if (lp->mode == 1) {    /* only needed for Busmaster */
                int xmit_stop, recv_stop;
 
-               if ((lp->chip == HP100_CHIPID_RAINIER)
-                   || (lp->chip == HP100_CHIPID_SHASTA)) {
+               if ((lp->chip == HP100_CHIPID_RAINIER) ||
+                   (lp->chip == HP100_CHIPID_SHASTA)) {
                        int pdl_stop;
 
                        /*