sh: Fix up some merge damage.
authorPaul Mundt <lethal@linux-sh.org>
Mon, 20 Oct 2008 02:37:58 +0000 (11:37 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 20 Oct 2008 02:37:58 +0000 (11:37 +0900)
commit9a19eb2a6607f2f6329efb3c4637fe23afae2cd7
treec730bca14d2c6ea8b5e8778e15bd1c219c554d4b
parent4cb40f795af36b3deb743f6ccf6c3fd542c61c8d
sh: Fix up some merge damage.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/include/asm/elf.h
arch/sh/kernel/setup.c