From f61bd2f9e66af3da8fcde55ef28d35cbfb24be7f Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 11 Nov 2005 11:46:25 +0000
Subject: [PATCH] --- yaml --- r: 14328 b: refs/heads/master c:
 efd9412d850397fc129c17eb33c84f74abb0d3ee h: refs/heads/master v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/mips/jmr3927/rbhma3100/setup.c              | 2 +-
 trunk/include/asm-mips/mach-jmr3927/{asm => }/ds1742.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename trunk/include/asm-mips/mach-jmr3927/{asm => }/ds1742.h (100%)

diff --git a/[refs] b/[refs]
index 21f08ade5bd5..9d1bf51e4d03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d93efab838ee399b45379bd97b2812ecee84471b
+refs/heads/master: efd9412d850397fc129c17eb33c84f74abb0d3ee
diff --git a/trunk/arch/mips/jmr3927/rbhma3100/setup.c b/trunk/arch/mips/jmr3927/rbhma3100/setup.c
index 3e2fbdc66097..55ad0a578794 100644
--- a/trunk/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/trunk/arch/mips/jmr3927/rbhma3100/setup.c
@@ -357,7 +357,7 @@ static void __init jmr3927_board_init(void)
 		       jmr3927_io_dipsw());
 }
 
-void __init plat_setup(void)
+void __init tx3927_setup(void)
 {
 	int i;
 
diff --git a/trunk/include/asm-mips/mach-jmr3927/asm/ds1742.h b/trunk/include/asm-mips/mach-jmr3927/ds1742.h
similarity index 100%
rename from trunk/include/asm-mips/mach-jmr3927/asm/ds1742.h
rename to trunk/include/asm-mips/mach-jmr3927/ds1742.h