diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2011-10-25 12:35:19 -0400 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-11-01 19:10:33 -0400 |
| commit | 47a6770ac6cd0d28f14dd9e1b17705abe6f05e41 (patch) | |
| tree | eeff9d16c6c8b58b4d88c3b1f29e3d77d3ed207b /arch/arm/mach-msm/board-msm8x60.c | |
| parent | b4beb4bf9934d151bf4581a54ae028927374cb2a (diff) | |
msm: boards: Fix fallout from removal of machine_desc in fixup
After 0744a3ee (ARM: platform fixups: remove mdesc argument to
fixup function, 2010-12-20) the fixup functions introduced in
9e775ad (ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs,
2011-08-12) cause warnings like:
arch/arm/mach-msm/board-msm8x60.c:85: warning: initialization
from incompatible pointer type
Fix them by removing the machine_desc argument from the fixup
functions.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/board-msm8x60.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm8x60.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c index 106170fb1844..eed73e2609ed 100644 --- a/arch/arm/mach-msm/board-msm8x60.c +++ b/arch/arm/mach-msm/board-msm8x60.c | |||
| @@ -30,8 +30,8 @@ | |||
| 30 | #include <mach/board.h> | 30 | #include <mach/board.h> |
| 31 | #include <mach/msm_iomap.h> | 31 | #include <mach/msm_iomap.h> |
| 32 | 32 | ||
| 33 | static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag, | 33 | static void __init msm8x60_fixup(struct tag *tag, char **cmdline, |
| 34 | char **cmdline, struct meminfo *mi) | 34 | struct meminfo *mi) |
| 35 | { | 35 | { |
| 36 | for (; tag->hdr.size; tag = tag_next(tag)) | 36 | for (; tag->hdr.size; tag = tag_next(tag)) |
| 37 | if (tag->hdr.tag == ATAG_MEM && | 37 | if (tag->hdr.tag == ATAG_MEM && |