diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/ar7/memory.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/ar7/memory.c')
| -rw-r--r-- | arch/mips/ar7/memory.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c index 696c723dc6d4..28abfeef09d6 100644 --- a/arch/mips/ar7/memory.c +++ b/arch/mips/ar7/memory.c | |||
| @@ -62,8 +62,7 @@ void __init prom_meminit(void) | |||
| 62 | unsigned long pages; | 62 | unsigned long pages; |
| 63 | 63 | ||
| 64 | pages = memsize() >> PAGE_SHIFT; | 64 | pages = memsize() >> PAGE_SHIFT; |
| 65 | add_memory_region(PHYS_OFFSET, pages << PAGE_SHIFT, | 65 | add_memory_region(PHYS_OFFSET, pages << PAGE_SHIFT, BOOT_MEM_RAM); |
| 66 | BOOT_MEM_RAM); | ||
| 67 | } | 66 | } |
| 68 | 67 | ||
| 69 | void __init prom_free_prom_memory(void) | 68 | void __init prom_free_prom_memory(void) |