git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 8025/1: Get rid of meminfo
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
corgi.c
diff --git
a/arch/arm/mach-pxa/corgi.c
b/arch/arm/mach-pxa/corgi.c
index 57d60542f982d03c7a384cd48be29e55823b5e01..91dd1c7cdbcd7dd79638eb0930d17a9945c6a87a 100644
(file)
--- a/
arch/arm/mach-pxa/corgi.c
+++ b/
arch/arm/mach-pxa/corgi.c
@@
-34,6
+34,7
@@
#include <linux/input/matrix_keypad.h>
#include <linux/gpio_keys.h>
#include <linux/module.h>
#include <linux/input/matrix_keypad.h>
#include <linux/gpio_keys.h>
#include <linux/module.h>
+#include <linux/memblock.h>
#include <video/w100fb.h>
#include <asm/setup.h>
#include <video/w100fb.h>
#include <asm/setup.h>
@@
-753,16
+754,13
@@
static void __init corgi_init(void)
platform_add_devices(devices, ARRAY_SIZE(devices));
}
platform_add_devices(devices, ARRAY_SIZE(devices));
}
-static void __init fixup_corgi(struct tag *tags, char **cmdline,
- struct meminfo *mi)
+static void __init fixup_corgi(struct tag *tags, char **cmdline)
{
sharpsl_save_param();
{
sharpsl_save_param();
- mi->nr_banks=1;
- mi->bank[0].start = 0xa0000000;
if (machine_is_corgi())
if (machine_is_corgi())
- m
i->bank[0].size = (32*1024*1024
);
+ m
emblock_add(0xa0000000, SZ_32M
);
else
else
- m
i->bank[0].size = (64*1024*1024
);
+ m
emblock_add(0xa0000000, SZ_64M
);
}
#ifdef CONFIG_MACH_CORGI
}
#ifdef CONFIG_MACH_CORGI