Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm / lib / Makefile

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index d8a7807..27f4d96 100644 (file)
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -29,7 +29,10 @@ else
   lib-y        += io-readsw-armv4.o io-writesw-armv4.o
 endif
 
-lib-$(CONFIG_ARCH_RPC)         += ecard.o io-acorn.o floppydma.o
+ifeq ($(CONFIG_ARCH_RPC),y)
+  lib-y                                += ecard.o io-acorn.o floppydma.o
+  AFLAGS_delay-loop.o          += -march=armv4
+endif
 
 $(obj)/csumpartialcopy.o:      $(obj)/csumpartialcopygeneric.S
 $(obj)/csumpartialcopyuser.o:  $(obj)/csumpartialcopygeneric.S