MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/801/
Reviewed-by: David VomLehn <dvomlehn@cisco.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --cc arch/mips/powertv/Makefile
Simple merge

diff --cc arch/mips/powertv/cmdline.c
Simple merge

diff --cc arch/mips/powertv/init.c
Simple merge

diff --cc arch/mips/powertv/init.h
Simple merge