Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[mv-sheeva.git] / arch / frv / mm / init.c

diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index 8899aa1a4f06f6e0d32a8d125b4a3b247ca53025..4103c2c487f3a114654f242f16b18d0e99281447 100644 (file)
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -16,7 +16,6 @@
  *    - Copyright (C) 1995  Hamish Macdonald
  */
 
-#include <linux/config.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/pagemap.h>
@@ -99,7 +98,7 @@ void show_mem(void)
  */
 void __init paging_init(void)
 {
-       unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+       unsigned long zones_size[MAX_NR_ZONES] = {0, };
 
        /* allocate some pages for kernel housekeeping tasks */
        empty_bad_page_table    = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
@@ -127,8 +126,7 @@ void __init paging_init(void)
 
        /* distribute the allocatable pages across the various zones and pass them to the allocator
         */
-       zones_size[ZONE_DMA]     = max_low_pfn - min_low_pfn;
-       zones_size[ZONE_NORMAL]  = 0;
+       zones_size[ZONE_NORMAL]  = max_low_pfn - min_low_pfn;
 #ifdef CONFIG_HIGHMEM
        zones_size[ZONE_HIGHMEM] = num_physpages - num_mappedpages;
 #endif