Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / arch / arm / mach-clps711x / board-edb7211.c

diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index 077609841f14a8051977a173be594244376fed55..f9828f89972a164e4cb1782ac93e7d3031a66cac 100644 (file)
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
+#include <linux/memblock.h>
 
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/partitions.h>
@@ -133,7 +134,7 @@ static void __init edb7211_reserve(void)
 }
 
 static void __init
-fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
+fixup_edb7211(struct tag *tags, char **cmdline)
 {
        /*
         * Bank start addresses are not present in the information
@@ -143,11 +144,8 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
         * Banks sizes _are_ present in the param block, but we're
         * not using that information yet.
         */
-       mi->bank[0].start = 0xc0000000;
-       mi->bank[0].size = SZ_8M;
-       mi->bank[1].start = 0xc1000000;
-       mi->bank[1].size = SZ_8M;
-       mi->nr_banks = 2;
+       memblock_add(0xc0000000, SZ_8M);
+       memblock_add(0xc1000000, SZ_8M);
 }
 
 static void __init edb7211_init(void)