Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

diff --combined arch/arm/Makefile
index e150f23,c1d6003..8f117ac
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -93,16 -93,9 +93,16 @@@ ifeq ($(CONFIG_ARM_UNWIND),y
  CFLAGS_ABI    +=-funwind-tables
  endif
  
 +ifeq ($(CONFIG_THUMB2_KERNEL),y)
 +AFLAGS_AUTOIT :=$(call as-option,-Wa$(comma)-mimplicit-it=thumb,-Wa$(comma)-mauto-it)
 +AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
 +CFLAGS_THUMB2 :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)
 +AFLAGS_THUMB2 :=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb
 +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
 +KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_THUMB2) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
 +KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_THUMB2) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
  
  CHECKFLAGS    += -D__arm__
  
@@@ -142,6 -135,7 +142,7 @@@ machine-$(CONFIG_ARCH_MSM)         := ms
  machine-$(CONFIG_ARCH_MV78XX0)                := mv78xx0
  machine-$(CONFIG_ARCH_MX1)            := mx1
  machine-$(CONFIG_ARCH_MX2)            := mx2
+ machine-$(CONFIG_ARCH_MX25)           := mx25
  machine-$(CONFIG_ARCH_MX3)            := mx3
  machine-$(CONFIG_ARCH_NETX)           := netx
  machine-$(CONFIG_ARCH_NS9XXX)         := ns9xxx
@@@ -165,6 -159,7 +166,7 @@@ machine-$(CONFIG_ARCH_U300)                := u30
  machine-$(CONFIG_ARCH_VERSATILE)      := versatile
  machine-$(CONFIG_ARCH_W90X900)                := w90x900
  machine-$(CONFIG_FOOTBRIDGE)          := footbridge
+ machine-$(CONFIG_ARCH_MXC91231)               := mxc91231
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.