| To: | Ralf Baechle <ralf@linux-mips.org> |
|---|---|
| Subject: | [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() |
| From: | Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> |
| Date: | Sun, 13 Jul 2008 20:01:04 +0900 |
| Cc: | yoichi_yuasa@tripeaks.co.jp, Atsushi Nemoto <anemo@mba.ocn.ne.jp>, linux-mips <linux-mips@linux-mips.org> |
| In-reply-to: | <20080713195408.f3878fb2.yoichi_yuasa@tripeaks.co.jp> |
| Organization: | TriPeaks Corporation |
| Original-recipient: | rfc822;linux-mips@linux-mips.org |
| References: | <20080713195155.08c4285d.yoichi_yuasa@tripeaks.co.jp> <20080713195408.f3878fb2.yoichi_yuasa@tripeaks.co.jp> |
| Sender: | linux-mips-bounce@linux-mips.org |
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
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype, Yoichi Yuasa |
|---|---|
| Next by Date: | [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init(), Yoichi Yuasa |
| Previous by Thread: | [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init(), Yoichi Yuasa |
| Next by Thread: | [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init(), Yoichi Yuasa |
| Indexes: | [Date] [Thread] [Top] [All Lists] |