m68k: move coldfire platform code

Move the m68k ColdFire platform support code directory to be with the
existing m68k platforms. Although the ColdFire is not a platform as such,
we have always kept all its support together. No reason to change that
as this time.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7f7830f..2e24775 100644 (file)
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -94,7 +94,7 @@ head-y                                := arch/m68k/kernel/head.o
 head-$(CONFIG_SUN3)            := arch/m68k/kernel/sun3-head.o
 head-$(CONFIG_M68360)          := arch/m68k/platform/68360/head.o
 head-$(CONFIG_M68000)          := arch/m68k/platform/68000/head.o
-head-$(CONFIG_COLDFIRE)                := arch/m68k/platform/coldfire/head.o
+head-$(CONFIG_COLDFIRE)                := arch/m68k/coldfire/head.o
 
 core-y                         += arch/m68k/kernel/    arch/m68k/mm/
 libs-y                         += arch/m68k/lib/
@@ -116,7 +116,7 @@ core-$(CONFIG_M68060)               += arch/m68k/ifpsp060/
 core-$(CONFIG_M68KFPU_EMU)     += arch/m68k/math-emu/
 core-$(CONFIG_M68360)          += arch/m68k/platform/68360/
 core-$(CONFIG_M68000)          += arch/m68k/platform/68000/
-core-$(CONFIG_COLDFIRE)                += arch/m68k/platform/coldfire/
+core-$(CONFIG_COLDFIRE)                += arch/m68k/coldfire/
 
 
 all:   zImage

diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/coldfire/Makefile
similarity index 100%
rename from arch/m68k/platform/coldfire/Makefile
rename to arch/m68k/coldfire/Makefile

diff --git a/arch/m68k/platform/coldfire/cache.c b/arch/m68k/coldfire/cache.c
similarity index 100%
rename from arch/m68k/platform/coldfire/cache.c
rename to arch/m68k/coldfire/cache.c

diff --git a/arch/m68k/platform/coldfire/clk.c b/arch/m68k/coldfire/clk.c
similarity index 100%
rename from arch/m68k/platform/coldfire/clk.c
rename to arch/m68k/coldfire/clk.c

diff --cc arch/m68k/coldfire/device.c
Simple merge

diff --cc arch/m68k/coldfire/dma.c
Simple merge

diff --cc arch/m68k/coldfire/dma_timer.c
Simple merge

diff --cc arch/m68k/coldfire/entry.S
Simple merge

diff --cc arch/m68k/coldfire/firebee.c
Simple merge

diff --cc arch/m68k/coldfire/gpio.c
Simple merge

diff --cc arch/m68k/coldfire/head.S
Simple merge

diff --cc arch/m68k/coldfire/intc-2.c
Simple merge

diff --cc arch/m68k/coldfire/intc-5249.c
Simple merge

diff --cc arch/m68k/coldfire/intc-525x.c
Simple merge

diff --cc arch/m68k/coldfire/intc-5272.c
Simple merge

diff --cc arch/m68k/coldfire/intc-simr.c
Simple merge

diff --cc arch/m68k/coldfire/intc.c
Simple merge

diff --cc arch/m68k/coldfire/m5206.c
Simple merge

diff --cc arch/m68k/coldfire/m520x.c
Simple merge

diff --cc arch/m68k/coldfire/m523x.c
Simple merge

diff --cc arch/m68k/coldfire/m5249.c
Simple merge

diff --cc arch/m68k/coldfire/m525x.c
Simple merge

diff --cc arch/m68k/coldfire/m5272.c
Simple merge

diff --cc arch/m68k/coldfire/m527x.c
Simple merge

diff --cc arch/m68k/coldfire/m528x.c
Simple merge

diff --cc arch/m68k/coldfire/m5307.c
Simple merge

diff --cc arch/m68k/coldfire/m53xx.c
Simple merge

diff --cc arch/m68k/coldfire/m5407.c
Simple merge

diff --cc arch/m68k/coldfire/m5441x.c
Simple merge

diff --cc arch/m68k/coldfire/m54xx.c
Simple merge

diff --cc arch/m68k/coldfire/mcf8390.c
Simple merge

diff --cc arch/m68k/coldfire/nettel.c
Simple merge

diff --cc arch/m68k/coldfire/pci.c
Simple merge

diff --cc arch/m68k/coldfire/pit.c
Simple merge

diff --cc arch/m68k/coldfire/reset.c
Simple merge

diff --cc arch/m68k/coldfire/sltimers.c
Simple merge

diff --cc arch/m68k/coldfire/timers.c
Simple merge

diff --cc arch/m68k/coldfire/vectors.c
Simple merge