diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
| commit | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (patch) | |
| tree | fe6fa1c0b92c43804a31b443ce4b5159d4d0ce13 /arch/arm/mach-msm/board-msm8960.c | |
| parent | f87114e982cf3b657411e2df50e4e42ec1f162dd (diff) | |
| parent | be09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (diff) | |
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-msm/board-msm8960.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm8960.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 32 | 32 | ||
| 33 | #include "devices.h" | 33 | #include "devices.h" |
| 34 | 34 | ||
| 35 | static void __init msm8960_fixup(struct machine_desc *desc, struct tag *tag, | 35 | static void __init msm8960_fixup(struct tag *tag, char **cmdline, |
| 36 | char **cmdline, struct meminfo *mi) | 36 | struct meminfo *mi) |
| 37 | { | 37 | { |
| 38 | for (; tag->hdr.size; tag = tag_next(tag)) | 38 | for (; tag->hdr.size; tag = tag_next(tag)) |
| 39 | if (tag->hdr.tag == ATAG_MEM && | 39 | if (tag->hdr.tag == ATAG_MEM && |