diff options
| author | Stephen Boyd | 2011-10-25 18:35:19 +0200 |
|---|---|---|
| committer | David Brown | 2011-11-02 00:10:33 +0100 |
| commit | 47a6770ac6cd0d28f14dd9e1b17705abe6f05e41 (patch) | |
| tree | eeff9d16c6c8b58b4d88c3b1f29e3d77d3ed207b /arch | |
| parent | Merge branch 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux (diff) | |
| download | kernel-qcow2-linux-47a6770ac6cd0d28f14dd9e1b17705abe6f05e41.tar.gz kernel-qcow2-linux-47a6770ac6cd0d28f14dd9e1b17705abe6f05e41.tar.xz kernel-qcow2-linux-47a6770ac6cd0d28f14dd9e1b17705abe6f05e41.zip | |
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')
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-msm/board-msm8960.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-msm/board-msm8x60.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index 71de5062c71e..db81ed531031 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c @@ -42,8 +42,8 @@ extern struct sys_timer msm_timer; -static void __init msm7x30_fixup(struct machine_desc *desc, struct tag *tag, - char **cmdline, struct meminfo *mi) +static void __init msm7x30_fixup(struct tag *tag, char **cmdline, + struct meminfo *mi) { for (; tag->hdr.size; tag = tag_next(tag)) if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) { diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c index b04468e7d00e..6dc1cbd2a595 100644 --- a/arch/arm/mach-msm/board-msm8960.c +++ b/arch/arm/mach-msm/board-msm8960.c @@ -32,8 +32,8 @@ #include "devices.h" -static void __init msm8960_fixup(struct machine_desc *desc, struct tag *tag, - char **cmdline, struct meminfo *mi) +static void __init msm8960_fixup(struct tag *tag, char **cmdline, + struct meminfo *mi) { for (; tag->hdr.size; tag = tag_next(tag)) if (tag->hdr.tag == ATAG_MEM && 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 @@ #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 && |