sh: Fix up some merge damage.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2 files changed