git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
fsl_booke_mmu.c
diff --git
a/arch/powerpc/mm/fsl_booke_mmu.c
b/arch/powerpc/mm/fsl_booke_mmu.c
index
fcfcb6e
..
c539472
100644
(file)
--- a/
arch/powerpc/mm/fsl_booke_mmu.c
+++ b/
arch/powerpc/mm/fsl_booke_mmu.c
@@
-207,7
+207,7
@@
unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx)
return amount_mapped;
}
-unsigned long __init mmu_mapin_ram(
void
)
+unsigned long __init mmu_mapin_ram(
unsigned long top
)
{
return tlbcam_addrs[tlbcam_index - 1].limit - PAGE_OFFSET + 1;
}