Merge commit 'v2.6.36-rc7' into core/memblock

[karo-tx-linux.git] / arch / powerpc / platforms / embedded6xx / wii.c

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 5cdcc7c8d9738416a8055840235ca5954d33abd2..649473a729b8843b251a2bbffaf26927b63ac15e 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -65,7 +65,7 @@ static int __init page_aligned(unsigned long x)
 
 void __init wii_memory_fixups(void)
 {
-       struct memblock_property *p = memblock.memory.region;
+       struct memblock_region *p = memblock.memory.regions;
 
        /*
         * This is part of a workaround to allow the use of two