The merge of sparsemem broke ARM discontigmem.  Fix it.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>