sparc64: Fix up merge thinko.



Signed-off-by: David S. Miller <davem@davemloft.net>

parent e9011d08

arch/sparc/mm/init_64.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -2795,4 +2795,3 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
		do_flush_tlb_kernel_range(start, end);
		}
		}
		>>>>>>> c78f77e20d2ba5d4d5e478e85a6fb42556893e2d