diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
| commit | bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa (patch) | |
| tree | b02319e809c5b8abfca85409a11472775e27f597 /arch/arm/mach-pxa/cm-x300.c | |
| parent | 06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 (diff) | |
| parent | eb0474544bc16a9dab53b26abd846e86ba814eb1 (diff) | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index b6a51340270b..d940e8a72270 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
| @@ -839,8 +839,8 @@ static void __init cm_x300_init(void) | |||
| 839 | cm_x300_init_bl(); | 839 | cm_x300_init_bl(); |
| 840 | } | 840 | } |
| 841 | 841 | ||
| 842 | static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags, | 842 | static void __init cm_x300_fixup(struct tag *tags, char **cmdline, |
| 843 | char **cmdline, struct meminfo *mi) | 843 | struct meminfo *mi) |
| 844 | { | 844 | { |
| 845 | /* Make sure that mi->bank[0].start = PHYS_ADDR */ | 845 | /* Make sure that mi->bank[0].start = PHYS_ADDR */ |
| 846 | for (; tags->hdr.size; tags = tag_next(tags)) | 846 | for (; tags->hdr.size; tags = tag_next(tags)) |