X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=arch%2Fm32r%2Fmm%2Fdiscontig.c;h=c7efdb0aefc5998768b0984137b035ce3f1cd7c3;hb=e6f194d8f6f50da6837af637b2fd839c34185f7a;hp=cf610a7c5ff0541f8dc051e99fa4825f69a73e31;hpb=0bb065f29bffc7895f0dbac1fc7d74b3a8d357a9;p=sfrench%2Fcifs-2.6.git

diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c
index cf610a7c5ff0..c7efdb0aefc5 100644
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
@@ -6,7 +6,6 @@
  *  Copyright (c) 2003  Hitoshi Yamamoto
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
 #include <linux/mmzone.h>
@@ -106,9 +105,7 @@ unsigned long __init setup_memory(void)
 		if (INITRD_START + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) {
 			reserve_bootmem_node(NODE_DATA(0), INITRD_START,
 				INITRD_SIZE);
-			initrd_start = INITRD_START ?
-				INITRD_START + PAGE_OFFSET : 0;
-
+			initrd_start = INITRD_START + PAGE_OFFSET;
 			initrd_end = initrd_start + INITRD_SIZE;
 			printk("initrd:start[%08lx],size[%08lx]\n",
 				initrd_start, INITRD_SIZE);