diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /arch/arm/mach-msm/board-msm7x30.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (diff) | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/mach-msm/board-msm7x30.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 4 |
1 files changed, 2 insertions, 2 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 @@ | |||
| 42 | 42 | ||
| 43 | extern struct sys_timer msm_timer; | 43 | extern struct sys_timer msm_timer; |
| 44 | 44 | ||
| 45 | static void __init msm7x30_fixup(struct machine_desc *desc, struct tag *tag, | 45 | static void __init msm7x30_fixup(struct tag *tag, char **cmdline, |
| 46 | char **cmdline, struct meminfo *mi) | 46 | struct meminfo *mi) |
| 47 | { | 47 | { |
| 48 | for (; tag->hdr.size; tag = tag_next(tag)) | 48 | for (; tag->hdr.size; tag = tag_next(tag)) |
| 49 | if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) { | 49 | if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) { |