diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-14 17:44:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-14 17:44:21 -0700 |
| commit | 9e7bcbe8be1088ce53998db477c938818f9ace36 (patch) | |
| tree | c13052bba804bfec2febf66789fca50396d9517f /arch/arm/mach-msm/board-halibut.c | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
| parent | af33eadc73e4a5d35a966c1c7ffe28a8424c9d96 (diff) | |
Merge branch 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into fixes
From David Brown:
"Here are some fixes for msm that fix problems caused by the latest
ARM code. The ones from Daniel remove unneeded fixups that now
cause compilation failures. Mine fix section mismatches, that were
incompletely fixed earlier."
* 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
ARM: msm: Fix section mismatches in proc_comm.c
video: msm: Fix section mismatches in mddi.c
arm: msm: trout: fix compile failure
arm: msm: halibut: remove unneeded fixup
Diffstat (limited to 'arch/arm/mach-msm/board-halibut.c')
| -rw-r--r-- | arch/arm/mach-msm/board-halibut.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c index 3698a370d63..26aac363a06 100644 --- a/arch/arm/mach-msm/board-halibut.c +++ b/arch/arm/mach-msm/board-halibut.c @@ -86,9 +86,6 @@ static void __init halibut_init(void) static void __init halibut_fixup(struct tag *tags, char **cmdline, struct meminfo *mi) { - mi->nr_banks=1; - mi->bank[0].start = PHYS_OFFSET; - mi->bank[0].size = (101*1024*1024); } static void __init halibut_map_io(void) |