aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2008-07-13 07:01:04 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 13:44:37 -0400
commita38c47519832f22659244fd8437722b7aaa67f9a (patch)
tree03d51bb21e37808ee3ddc214febdf06de7ae3967 /arch
parenta00fb6694f15b3bccf105f34f10bbcb6b47af67c (diff)
[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')
-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)
170 170
171static void __init rbtx4927_arch_init(void) 171static void __init rbtx4927_arch_init(void)
172{ 172{
173 if (mips_machtype == MACH_TOSHIBA_RBTX4937) 173 tx4927_pci_setup();
174 tx4937_pci_setup(); 174}
175 else 175
176 tx4927_pci_setup(); 176static void __init rbtx4937_arch_init(void)
177{
178 tx4937_pci_setup();
177} 179}
178#else 180#else
179#define rbtx4927_arch_init NULL 181#define rbtx4927_arch_init NULL
182#define rbtx4937_arch_init NULL
180#endif /* CONFIG_PCI */ 183#endif /* CONFIG_PCI */
181 184
182static void __noreturn wait_forever(void) 185static void __noreturn wait_forever(void)
@@ -433,7 +436,7 @@ struct txx9_board_vec rbtx4937_vec __initdata = {
433 .irq_setup = rbtx4927_irq_setup, 436 .irq_setup = rbtx4927_irq_setup,
434 .time_init = rbtx4927_time_init, 437 .time_init = rbtx4927_time_init,
435 .device_init = rbtx4927_device_init, 438 .device_init = rbtx4927_device_init,
436 .arch_init = rbtx4927_arch_init, 439 .arch_init = rbtx4937_arch_init,
437#ifdef CONFIG_PCI 440#ifdef CONFIG_PCI
438 .pci_map_irq = rbtx4927_pci_map_irq, 441 .pci_map_irq = rbtx4927_pci_map_irq,
439#endif 442#endif