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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x300.c
diff --git
a/arch/arm/mach-pxa/cm-x300.c
b/arch/arm/mach-pxa/cm-x300.c
index
b6a5134
..
d940e8a
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x300.c
+++ b/
arch/arm/mach-pxa/cm-x300.c
@@
-839,8
+839,8
@@
static void __init cm_x300_init(void)
cm_x300_init_bl();
}
cm_x300_init_bl();
}
-static void __init cm_x300_fixup(struct
machine_desc *mdesc, struct tag *tags
,
-
char **cmdline,
struct meminfo *mi)
+static void __init cm_x300_fixup(struct
tag *tags, char **cmdline
,
+ struct meminfo *mi)
{
/* Make sure that mi->bank[0].start = PHYS_ADDR */
for (; tags->hdr.size; tags = tag_next(tags))
{
/* Make sure that mi->bank[0].start = PHYS_ADDR */
for (; tags->hdr.size; tags = tag_next(tags))