]> err.no Git - linux-2.6/commitdiff
[MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Sun, 13 Jul 2008 11:01:04 +0000 (20:01 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 15 Jul 2008 17:44:37 +0000 (18:44 +0100)
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>
arch/mips/txx9/rbtx4927/setup.c

index bba6ef9db068d092e3d1595eeae62953e6f95e4a..b4c4178607c47635259809ac604e1378922e6672 100644 (file)
@@ -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