Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index de45aa82d97b11c133fb14ccab6fbdf2e2bce450..c12adc3ddffd892b3238025873afc7764eb20831 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -307,9 +307,9 @@ static void __init parse_drconf_memory(struct device_node *memory)
        const unsigned int *lm, *dm, *aa;
        unsigned int ls, ld, la;
        unsigned int n, aam, aalen;
-       unsigned long lmb_size, size;
+       unsigned long lmb_size, size, start;
        int nid, default_nid = 0;
-       unsigned int start, ai, flags;
+       unsigned int ai, flags;
 
        lm = of_get_property(memory, "ibm,lmb-size", &ls);
        dm = of_get_property(memory, "ibm,dynamic-memory", &ld);