[PATCH] initrd: remove unused false condition for initrd_start

After LOADER_TYPE && INITRD_START are true, the short if-condition
for INITRD_START can never be false.

Remove unused code from the else condition.

Signed-off-by: Henry Nestler <henry.ne@arcor.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c
index abb34ccd5986..c7efdb0aefc5 100644
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
@@ -105,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);