---

yaml --- r: 295735 b: refs/heads/master c: c444dc0 h: refs/heads/master i: 295733: 6b58393 295731: 3febaca 295727: 96e08a4 v: v3
git-mirror · Mar 14, 2012 · 059913e · 059913e
1 parent 4aa6e07
commit 059913e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 999c53fb2200070bdb8923c1894f9e14a5ec2de3
+refs/heads/master: c444dc0765d4ab87e920c1aeb1a5a622c9b661f9
diff --git a/trunk/arch/arm/kernel/Makefile b/trunk/arch/arm/kernel/Makefile
@@ -62,9 +62,6 @@ obj-$(CONFIG_SWP_EMULATE)	+= swp_emulate.o
 CFLAGS_swp_emulate.o		:= -Wa,-march=armv7-a
 obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o
 
-obj-$(CONFIG_CRUNCH)		+= crunch.o crunch-bits.o
-AFLAGS_crunch-bits.o		:= -Wa,-mcpu=ep9312
-
 obj-$(CONFIG_CPU_XSCALE)	+= xscale-cp0.o
 obj-$(CONFIG_CPU_XSC3)		+= xscale-cp0.o
 obj-$(CONFIG_CPU_MOHAWK)	+= xscale-cp0.o

diff --git a/trunk/arch/arm/mach-ep93xx/Makefile b/trunk/arch/arm/mach-ep93xx/Makefile
@@ -8,6 +8,9 @@ obj-			:=
 
 obj-$(CONFIG_EP93XX_DMA)	+= dma.o
 
+obj-$(CONFIG_CRUNCH)		+= crunch.o crunch-bits.o
+AFLAGS_crunch-bits.o		:= -Wa,-mcpu=ep9312
+
 obj-$(CONFIG_MACH_ADSSPHERE)	+= adssphere.o
 obj-$(CONFIG_MACH_EDB93XX)	+= edb93xx.o
 obj-$(CONFIG_MACH_GESBC9312)	+= gesbc9312.o

diff --git a/trunk/arch/arm/kernel/crunch-bits.S → trunk/arch/arm/mach-ep93xx/crunch-bits.S b/trunk/arch/arm/kernel/crunch-bits.S → trunk/arch/arm/mach-ep93xx/crunch-bits.S
diff --git a/trunk/arch/arm/kernel/crunch.c → trunk/arch/arm/mach-ep93xx/crunch.c b/trunk/arch/arm/kernel/crunch.c → trunk/arch/arm/mach-ep93xx/crunch.c