Merge remote-tracking branches 'asoc/fix/adau1761', 'asoc/fix/fsl', 'asoc/fix/intel...

[cascardo/linux.git] / arch / m68k / Makefile

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7f7830f..0b29dcf 100644 (file)
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -92,9 +92,9 @@ 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_COLDFIRE)                := arch/m68k/platform/coldfire/head.o
+head-$(CONFIG_M68360)          := arch/m68k/68360/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/
 libs-y                         += arch/m68k/lib/
@@ -114,9 +114,9 @@ core-$(CONFIG_NATFEAT)              += arch/m68k/emu/
 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_COLDFIRE)                += arch/m68k/platform/coldfire/
+core-$(CONFIG_M68360)          += arch/m68k/68360/
+core-$(CONFIG_M68000)          += arch/m68k/68000/
+core-$(CONFIG_COLDFIRE)                += arch/m68k/coldfire/
 
 
 all:   zImage