---

yaml --- r: 302677 b: refs/heads/master c: 9f8c8c0 h: refs/heads/master i: 302675: 95e95d6 v: v3
git-mirror · May 20, 2012 · 28c8121 · 28c8121
1 parent f094b1f
commit 28c8121
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 136f148f61fb7d53f104abcf827a90bf8fa6c8f7
+refs/heads/master: 9f8c8c072dd0ce0c76dfd2277169f933b0cc6ca5
diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile
@@ -116,7 +116,6 @@ core-$(CONFIG_M68EZ328)		+= arch/m68k/platform/68EZ328/
 core-$(CONFIG_M68VZ328)		+= arch/m68k/platform/68VZ328/
 core-$(CONFIG_COLDFIRE)		+= arch/m68k/platform/coldfire/
 core-$(CONFIG_M532x)		+= arch/m68k/platform/532x/
-core-$(CONFIG_M5407)		+= arch/m68k/platform/5407/
 core-$(CONFIG_M54xx)		+= arch/m68k/platform/54xx/
 
 

diff --git a/trunk/arch/m68k/platform/5407/Makefile b/trunk/arch/m68k/platform/5407/Makefile
diff --git a/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_M5272)	+= m5272.o intc-5272.o timers.o
 obj-$(CONFIG_M528x)	+= m528x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)	+= m5307.o timers.o intc.o reset.o
 obj-$(CONFIG_M532x)	+= timers.o intc-simr.o reset.o
-obj-$(CONFIG_M5407)	+= timers.o intc.o reset.o
+obj-$(CONFIG_M5407)	+= m5407.o timers.o intc.o reset.o
 obj-$(CONFIG_M54xx)	+= sltimers.o intc-2.o
 
 obj-$(CONFIG_NETtel)	+= nettel.o

diff --git a/trunk/arch/m68k/platform/5407/config.c → trunk/arch/m68k/platform/coldfire/m5407.c b/trunk/arch/m68k/platform/5407/config.c → trunk/arch/m68k/platform/coldfire/m5407.c