git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
corgi.c
diff --git
a/arch/arm/mach-pxa/corgi.c
b/arch/arm/mach-pxa/corgi.c
index
185a37c
..
3e9483b
100644
(file)
--- a/
arch/arm/mach-pxa/corgi.c
+++ b/
arch/arm/mach-pxa/corgi.c
@@
-705,8
+705,8
@@
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
machine_desc *desc
,
-
struct tag *tags, char **cmdline,
struct meminfo *mi)
+static void __init fixup_corgi(struct
tag *tags, char **cmdline
,
+
struct meminfo *mi)
{
sharpsl_save_param();
mi->nr_banks=1;
{
sharpsl_save_param();
mi->nr_banks=1;