diff -uNr linux-2.6.7-orig/arch/arm/Makefile linux-2.6.7/arch/arm/Makefile
--- linux-2.6.7-orig/arch/arm/Makefile	2004-06-18 19:03:53.000000000 +0100
+++ linux-2.6.7/arch/arm/Makefile	2004-06-19 01:41:41.000000000 +0100
@@ -55,7 +55,7 @@
 tune-$(CONFIG_CPU_V6)		:=-mtune=strongarm
 
 # Need -Uarm for gcc < 3.x
-CFLAGS		+=-mapcs-32 $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float
+CFLAGS		+=-mapcs-32 $(arch-y) $(tune-y) -malignment-traps -msoft-float
 AFLAGS		+=-mapcs-32 $(arch-y) $(tune-y) -msoft-float
 
 #Default value