Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Sun, 13 Jul 2008 04:06:33 -0700
Received: from dalesmta2-3.messageone.com ([129.41.169.249]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Sun, 13 Jul 2008 04:06:32 -0700
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])
	by dalesmta2-3.messageone.com (8.13.8/8.13.8) with ESMTP id m6DB6V07010882
	for <andy.sharp@onstor.com>; Sun, 13 Jul 2008 06:06:32 -0500
Received: from localhost.localdomain ([127.0.0.1]:224 "EHLO ftp.linux-mips.org")
	by ftp.linux-mips.org with ESMTP id S20036320AbYGMLFx (ORCPT
	<rfc822;andy.sharp@onstor.com>); Sun, 13 Jul 2008 12:05:53 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 13 Jul 2008 12:05:36 +0100 (BST)
Received: from mo30.po.2iij.net ([210.128.50.53]:43591 "EHLO mo30.po.2iij.net")
	by ftp.linux-mips.org with ESMTP id S20036268AbYGMLFN (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Sun, 13 Jul 2008 12:05:13 +0100
Received: by mo.po.2iij.net (mo30) id m6DB5Bnk001170; Sun, 13 Jul 2008 20:05:11 +0900 (JST)
Received: from delta (61.25.30.125.dy.iij4u.or.jp [125.30.25.61])
	by mbox.po.2iij.net (po-mbox301) id m6DB58tT025873
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Sun, 13 Jul 2008 20:05:08 +0900
Date: 	Sun, 13 Jul 2008 20:01:04 +0900
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: yoichi_yuasa@tripeaks.co.jp, Atsushi Nemoto <anemo@mba.ocn.ne.jp>,
        linux-mips <linux-mips@linux-mips.org>
Subject: [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and
 rbtx4937_arch_init()
Message-Id: <20080713200104.02e6d163.yoichi_yuasa@tripeaks.co.jp>
In-Reply-To: <20080713195408.f3878fb2.yoichi_yuasa@tripeaks.co.jp>
References: <20080713195155.08c4285d.yoichi_yuasa@tripeaks.co.jp>
	<20080713195408.f3878fb2.yoichi_yuasa@tripeaks.co.jp>
Organization: TriPeaks Corporation
X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.9; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-archive-position: 19801
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: yoichi_yuasa@tripeaks.co.jp
Precedence: bulk
X-list: 	linux-mips
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-07-12_01:2008-07-09,2008-07-12,2008-07-12 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: linux-mips-bounce@linux-mips.org
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0807130024
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 13 Jul 2008 11:06:33.0196 (UTC) FILETIME=[8267AAC0:01C8E4D8]

Separate rbtx4927_arch_init() and rbtx4937_arch_init().

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/rbtx4927/setup.c linux/arch/mips/txx9/rbtx4927/setup.c
--- linux-orig/arch/mips/txx9/rbtx4927/setup.c	2008-07-13 16:49:44.924681441 +0900
+++ linux/arch/mips/txx9/rbtx4927/setup.c	2008-07-13 16:50:54.684656833 +0900
@@ -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 __ini
 	.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

