--- work/linux-2.6.31.14.27-efikamx_20111026/arch/arm/Makefile  2011-10-26 09:34:26.000000000 +0000
+++ work/linux-2.6.31.14.27-efikamx_20111026/arch/arm/Makefile_arm_unaligned   2012-10-11 00:49:16.654988563 +0000
@@ -94,6 +94,10 @@
 CFLAGS_ABI	+=-funwind-tables
 endif
 
+ifeq ($(CONFIG_ALIGNMENT_TRAP),y)
+CFLAGS_ABI	+=$(call cc-option,-mno-unaligned-access,)
+endif
+
 # Need -Uarm for gcc < 3.x
 KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
 KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float