---

yaml --- r: 302673 b: refs/heads/master c: 40711cc h: refs/heads/master i: 302671: 115eb08 v: v3
git-mirror · May 20, 2012 · 44210a8 · 44210a8
1 parent 506db01
commit 44210a8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d11251168d1f4104b4824893288f1220ead22b3
+refs/heads/master: 40711ccb22bb3f851291fa4b9d59a5a4ec6f7949
diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile
@@ -116,7 +116,6 @@ 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_M5272)		+= arch/m68k/platform/5272/
 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/5272/Makefile b/trunk/arch/m68k/platform/5272/Makefile
diff --git a/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile
@@ -21,7 +21,7 @@ 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_M5272)	+= timers.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
 obj-$(CONFIG_M532x)	+= timers.o intc-simr.o reset.o

diff --git a/trunk/arch/m68k/platform/5272/intc.c → ...k/arch/m68k/platform/coldfire/intc-5272.c b/trunk/arch/m68k/platform/5272/intc.c → ...k/arch/m68k/platform/coldfire/intc-5272.c
diff --git a/trunk/arch/m68k/platform/5272/config.c → trunk/arch/m68k/platform/coldfire/m5272.c b/trunk/arch/m68k/platform/5272/config.c → trunk/arch/m68k/platform/coldfire/m5272.c