summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2008-07-13 13:01:04 +0200
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 19:44:37 +0200
commita38c47519832f22659244fd8437722b7aaa67f9a (patch)
tree03d51bb21e37808ee3ddc214febdf06de7ae3967 /arch/mips
parent[MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() (diff)
downloadlinux-a38c47519832f22659244fd8437722b7aaa67f9a.tar.xz
linux-a38c47519832f22659244fd8437722b7aaa67f9a.zip
[MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/txx9/rbtx4927/setup.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
index bba6ef9db068..b4c4178607c4 100644
--- a/arch/mips/txx9/rbtx4927/setup.c
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -170,13 +170,16 @@ static void __init tx4937_pci_setup(void)
static void __init rbtx4927_arch_init(void)
{
- if (mips_machtype == MACH_TOSHIBA_RBTX4937)
- tx4937_pci_setup();
- else
- tx4927_pci_setup();
+ tx4927_pci_setup();
+}
+
+static void __init rbtx4937_arch_init(void)
+{
+ tx4937_pci_setup();
}
#else
#define rbtx4927_arch_init NULL
+#define rbtx4937_arch_init NULL
#endif /* CONFIG_PCI */
static void __noreturn wait_forever(void)
@@ -433,7 +436,7 @@ struct txx9_board_vec rbtx4937_vec __initdata = {
.irq_setup = rbtx4927_irq_setup,
.time_init = rbtx4927_time_init,
.device_init = rbtx4927_device_init,
- .arch_init = rbtx4927_arch_init,
+ .arch_init = rbtx4937_arch_init,
#ifdef CONFIG_PCI
.pci_map_irq = rbtx4927_pci_map_irq,
#endif