From 34b3e8c5dcd5b3891ee7f6c434bc69df437e7cdf Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Wed, 15 Jul 2009 22:03:56 +0900
Subject: [PATCH] --- yaml --- r: 156399 b: refs/heads/master c:
 3e6e92183118d26d856e8efb549987164d1b49b4 h: refs/heads/master i:   156397:
 385f1dc95ba21e0213e326e842c6206628064c09   156395:
 6d09e6f72d3d0c1ccf974fddbd99e2deb025934f   156391:
 4c3eda0ed0cbb400aa824138912a5c2966015a41   156383:
 9e28db89ffa8321f26ee961c78bad2d8c719cfb5 v: v3

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

diff --git a/[refs] b/[refs]
index aeb92a7462d0..692f4b029294 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ca71737fee65521ede964afbd2d5484976ed0ed
+refs/heads/master: 3e6e92183118d26d856e8efb549987164d1b49b4
diff --git a/trunk/arch/mips/txx9/rbtx4939/setup.c b/trunk/arch/mips/txx9/rbtx4939/setup.c
index c033ffe71cdf..b0c241ecf603 100644
--- a/trunk/arch/mips/txx9/rbtx4939/setup.c
+++ b/trunk/arch/mips/txx9/rbtx4939/setup.c
@@ -512,10 +512,10 @@ static void __init rbtx4939_setup(void)
 	rbtx4939_ebusc_setup();
 	/* always enable ATA0 */
 	txx9_set64(&tx4939_ccfgptr->pcfg, TX4939_PCFG_ATA0MODE);
-	rbtx4939_update_ioc_pen();
 	if (txx9_master_clock == 0)
 		txx9_master_clock = 20000000;
 	tx4939_setup();
+	rbtx4939_update_ioc_pen();
 #ifdef HAVE_RBTX4939_IOSWAB
 	ioswabw = rbtx4939_ioswabw;
 	__mem_ioswabw = rbtx4939_mem_ioswabw;