---

yaml --- r: 302670 b: refs/heads/master c: a654730 h: refs/heads/master v: v3
git-mirror · May 20, 2012 · bfca93a · bfca93a
1 parent 27be21b
commit bfca93a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daacd5cc255bdba62b1be999c7b77ca1015a79a3
+refs/heads/master: a654730ec1cd5b4bc170e7ae7ee358f2a7a554c2
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_M520x)		+= arch/m68k/platform/520x/
 core-$(CONFIG_M523x)		+= arch/m68k/platform/523x/
 core-$(CONFIG_M5249)		+= arch/m68k/platform/5249/
 core-$(CONFIG_M527x)		+= arch/m68k/platform/527x/

diff --git a/trunk/arch/m68k/platform/520x/Makefile b/trunk/arch/m68k/platform/520x/Makefile
diff --git a/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile
@@ -17,7 +17,7 @@ asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 obj-$(CONFIG_COLDFIRE)	+= cache.o clk.o device.o dma.o entry.o vectors.o
 obj-$(CONFIG_M5206)	+= m5206.o timers.o intc.o reset.o
 obj-$(CONFIG_M5206e)	+= m5206.o timers.o intc.o reset.o
-obj-$(CONFIG_M520x)	+= pit.o intc-simr.o reset.o
+obj-$(CONFIG_M520x)	+= m520x.o pit.o intc-simr.o reset.o
 obj-$(CONFIG_M523x)	+= pit.o dma_timer.o intc-2.o reset.o
 obj-$(CONFIG_M5249)	+= timers.o intc.o reset.o
 obj-$(CONFIG_M527x)	+= pit.o intc-2.o reset.o

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