Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / include / asm / setup.h

diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 33fea71547b02e3a7fee7b983527a4c1076c87d3..7ffbb29a0e9dc3e03e8ee1a5b53042e366ce6a59 100644 (file)
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -221,9 +221,11 @@ struct meminfo {
        struct membank bank[NR_BANKS];
 };
 
+extern struct meminfo meminfo;
+
 #define for_each_nodebank(iter,mi,no)                  \
-       for (iter = 0; iter < mi->nr_banks; iter++)     \
-               if (mi->bank[iter].node == no)
+       for (iter = 0; iter < (mi)->nr_banks; iter++)   \
+               if ((mi)->bank[iter].node == no)
 
 #define bank_pfn_start(bank)   __phys_to_pfn((bank)->start)
 #define bank_pfn_end(bank)     __phys_to_pfn((bank)->start + (bank)->size)