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 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
board-msm8x60.c
diff --git
a/arch/arm/mach-msm/board-msm8x60.c
b/arch/arm/mach-msm/board-msm8x60.c
index
cf38e22
..
44bf716
100644
(file)
--- a/
arch/arm/mach-msm/board-msm8x60.c
+++ b/
arch/arm/mach-msm/board-msm8x60.c
@@
-28,8
+28,8
@@
#include <mach/board.h>
#include <mach/msm_iomap.h>
#include <mach/board.h>
#include <mach/msm_iomap.h>
-static void __init msm8x60_fixup(struct
machine_desc *desc, struct tag *tag
,
-
char **cmdline,
struct meminfo *mi)
+static void __init msm8x60_fixup(struct
tag *tag, char **cmdline
,
+ struct meminfo *mi)
{
for (; tag->hdr.size; tag = tag_next(tag))
if (tag->hdr.tag == ATAG_MEM &&
{
for (; tag->hdr.size; tag = tag_next(tag))
if (tag->hdr.tag == ATAG_MEM &&