Merge branch 'master' into upstream

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index c52497bb102a..5b06349af2d5 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -163,10 +163,10 @@ static int __init page_is_ram(unsigned long pagenr)
 
 void __init paging_init(void)
 {
-        unsigned long zones_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };
+        unsigned long zones_size[] = { 0, };
         unsigned long max_dma, high, low;
 #ifndef CONFIG_FLATMEM
-        unsigned long zholes_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };
+        unsigned long zholes_size[] = { 0, };
         unsigned long i, j, pfn;
 #endif