---

yaml --- r: 302674 b: refs/heads/master c: 60fb32c h: refs/heads/master v: v3
git-mirror · May 20, 2012 · 28669e6 · 28669e6
1 parent 44210a8
commit 28669e6
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: 40711ccb22bb3f851291fa4b9d59a5a4ec6f7949
+refs/heads/master: 60fb32ca61390360f2cce750ad2715b80e629027
diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile
@@ -115,7 +115,6 @@ core-$(CONFIG_M68000)		+= arch/m68k/platform/68328/
 core-$(CONFIG_M68EZ328)		+= arch/m68k/platform/68EZ328/
 core-$(CONFIG_M68VZ328)		+= arch/m68k/platform/68VZ328/
 core-$(CONFIG_COLDFIRE)		+= arch/m68k/platform/coldfire/
-core-$(CONFIG_M527x)		+= arch/m68k/platform/527x/
 core-$(CONFIG_M528x)		+= arch/m68k/platform/528x/
 core-$(CONFIG_M5307)		+= arch/m68k/platform/5307/
 core-$(CONFIG_M532x)		+= arch/m68k/platform/532x/

diff --git a/trunk/arch/m68k/platform/527x/Makefile b/trunk/arch/m68k/platform/527x/Makefile
diff --git a/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_M5206e)	+= m5206.o timers.o intc.o reset.o
 obj-$(CONFIG_M520x)	+= m520x.o pit.o intc-simr.o reset.o
 obj-$(CONFIG_M523x)	+= m523x.o pit.o dma_timer.o intc-2.o reset.o
 obj-$(CONFIG_M5249)	+= m5249.o timers.o intc.o intc-5249.o reset.o
-obj-$(CONFIG_M527x)	+= pit.o intc-2.o reset.o
+obj-$(CONFIG_M527x)	+= m527x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5272)	+= m5272.o intc-5272.o timers.o
 obj-$(CONFIG_M528x)	+= pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)	+= timers.o intc.o reset.o

diff --git a/trunk/arch/m68k/platform/527x/config.c → trunk/arch/m68k/platform/coldfire/m527x.c b/trunk/arch/m68k/platform/527x/config.c → trunk/arch/m68k/platform/coldfire/m527x.c