diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2014-08-21 21:53:51 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2014-09-29 09:18:35 +1000 |
| commit | 18cb3faf6fc72ccfc2965aeec9e04fa7b0047c4c (patch) | |
| tree | 6aaa5b97033fb1ad5697752eaf3571ca475de0f0 /arch/m68k | |
| parent | ece9ae6515727d56ca21a8c925965b731a88b43b (diff) | |
| download | linux-18cb3faf6fc72ccfc2965aeec9e04fa7b0047c4c.tar.gz linux-18cb3faf6fc72ccfc2965aeec9e04fa7b0047c4c.tar.bz2 linux-18cb3faf6fc72ccfc2965aeec9e04fa7b0047c4c.zip | |
m68k: move non-mmu 68000 platform code
The non-mmu 68000 specific code is inconsistently placed under a directory
named "platform". Move it to arch/m68k/ along with the other platform and
machine directories.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/68000/Makefile (renamed from arch/m68k/platform/68000/Makefile) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/bootlogo-vz.h (renamed from arch/m68k/platform/68000/bootlogo-vz.h) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/bootlogo.h (renamed from arch/m68k/platform/68000/bootlogo.h) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/entry.S (renamed from arch/m68k/platform/68000/entry.S) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/head.S (renamed from arch/m68k/platform/68000/head.S) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/ints.c (renamed from arch/m68k/platform/68000/ints.c) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/m68328.c (renamed from arch/m68k/platform/68000/m68328.c) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/m68EZ328.c (renamed from arch/m68k/platform/68000/m68EZ328.c) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/m68VZ328.c (renamed from arch/m68k/platform/68000/m68VZ328.c) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/romvec.S (renamed from arch/m68k/platform/68000/romvec.S) | 0 | ||||
| -rw-r--r-- | arch/m68k/68000/timers.c (renamed from arch/m68k/platform/68000/timers.c) | 0 | ||||
| -rw-r--r-- | arch/m68k/Makefile | 4 |
12 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/platform/68000/Makefile b/arch/m68k/68000/Makefile index 1eab70c7194b..1eab70c7194b 100644 --- a/arch/m68k/platform/68000/Makefile +++ b/arch/m68k/68000/Makefile diff --git a/arch/m68k/platform/68000/bootlogo-vz.h b/arch/m68k/68000/bootlogo-vz.h index b38e2b255142..b38e2b255142 100644 --- a/arch/m68k/platform/68000/bootlogo-vz.h +++ b/arch/m68k/68000/bootlogo-vz.h diff --git a/arch/m68k/platform/68000/bootlogo.h b/arch/m68k/68000/bootlogo.h index b896c933fafc..b896c933fafc 100644 --- a/arch/m68k/platform/68000/bootlogo.h +++ b/arch/m68k/68000/bootlogo.h diff --git a/arch/m68k/platform/68000/entry.S b/arch/m68k/68000/entry.S index 23ac054c6e1a..23ac054c6e1a 100644 --- a/arch/m68k/platform/68000/entry.S +++ b/arch/m68k/68000/entry.S diff --git a/arch/m68k/platform/68000/head.S b/arch/m68k/68000/head.S index 536ef9616dad..536ef9616dad 100644 --- a/arch/m68k/platform/68000/head.S +++ b/arch/m68k/68000/head.S diff --git a/arch/m68k/platform/68000/ints.c b/arch/m68k/68000/ints.c index cda49b12d7be..cda49b12d7be 100644 --- a/arch/m68k/platform/68000/ints.c +++ b/arch/m68k/68000/ints.c diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/68000/m68328.c index e53caf4c3bfb..e53caf4c3bfb 100644 --- a/arch/m68k/platform/68000/m68328.c +++ b/arch/m68k/68000/m68328.c diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c index 21952906e9e2..21952906e9e2 100644 --- a/arch/m68k/platform/68000/m68EZ328.c +++ b/arch/m68k/68000/m68EZ328.c diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c index 0e5e5a10a021..0e5e5a10a021 100644 --- a/arch/m68k/platform/68000/m68VZ328.c +++ b/arch/m68k/68000/m68VZ328.c diff --git a/arch/m68k/platform/68000/romvec.S b/arch/m68k/68000/romvec.S index 15c70cd6453f..15c70cd6453f 100644 --- a/arch/m68k/platform/68000/romvec.S +++ b/arch/m68k/68000/romvec.S diff --git a/arch/m68k/platform/68000/timers.c b/arch/m68k/68000/timers.c index 99a98698bc95..99a98698bc95 100644 --- a/arch/m68k/platform/68000/timers.c +++ b/arch/m68k/68000/timers.c diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 2e2477591fdf..dd96fc270ea1 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -93,7 +93,7 @@ endif 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_M68000) := arch/m68k/68000/head.o head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o core-y += arch/m68k/kernel/ arch/m68k/mm/ @@ -115,7 +115,7 @@ core-$(CONFIG_M68040) += arch/m68k/fpsp040/ 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_M68000) += arch/m68k/68000/ core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/ |