From 4009f112b96b86c2302bf8f338b34a4533a380b9 Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Sun, 13 Jul 2008 20:01:04 +0900
Subject: [PATCH] --- yaml --- r: 101464 b: refs/heads/master c:
 a38c47519832f22659244fd8437722b7aaa67f9a h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/mips/txx9/rbtx4927/setup.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e7c1d1cc86d9..9fcdb32e053a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a00fb6694f15b3bccf105f34f10bbcb6b47af67c
+refs/heads/master: a38c47519832f22659244fd8437722b7aaa67f9a
diff --git a/trunk/arch/mips/txx9/rbtx4927/setup.c b/trunk/arch/mips/txx9/rbtx4927/setup.c
index bba6ef9db068..b4c4178607c4 100644
--- a/trunk/arch/mips/txx9/rbtx4927/setup.c
+++ b/trunk/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