Merge branches 'release', 'bugzilla-6217', 'bugzilla-6629', 'bugzilla-6933', 'bugzill...

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / 4xx.c

diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c
index 61a4045324cb78e04c128d91d256925a64aa13d4..758edf1c58156e1b44e25fa6deb931d86aa274fc 100644 (file)
--- a/arch/powerpc/boot/4xx.c
+++ b/arch/powerpc/boot/4xx.c
@@ -159,7 +159,7 @@ void ibm4xx_denali_fixup_memsize(void)
        val = DDR_GET_VAL(val, DDR_CS_MAP, DDR_CS_MAP_SHIFT);
        cs = 0;
        while (val) {
-               if (val && 0x1)
+               if (val & 0x1)
                        cs++;
                val = val >> 1;
        }