Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt
  [ARM] Update mach-types
  [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation
  [ARM] 3654/1: add ajeco 1arm sbc support
  [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug
  [ARM] 3651/1: S3C24XX: Make arch list more detailed
  [ARM] 3650/1: S3C2412: Update s3c2410_defconfig
  [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440
  [ARM] 3612/1: make pci bus optional for ixp4xx platform
  [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
  [ARM] Remove save_lr/restore_pc macros
  [ARM] Remove partial non-v6 binutils compatibility
  [ARM] Remove LOADREGS macro
  [ARM] Remove RETINSTR macro

2 files changed, 9 insertions, 3 deletions

diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S
index 57a3b163b2cb..d68b9acd826e 100644
--- a/arch/arm/boot/compressed/head-at91rm9200.S
+++ b/arch/arm/boot/compressed/head-at91rm9200.S
@@ -61,6 +61,12 @@
                 cmp     r7, r3
                 beq     99f
 
+                @ Ajeco 1ARM : 1075
+                mov     r3,     #(MACH_TYPE_ONEARM & 0xff)
+                orr     r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
+                cmp     r7, r3
+                beq     99f
+
                 @ Unknown board, use the AT91RM9200DK board
                 @ mov   r7, #MACH_TYPE_AT91RM9200
                 mov     r7,     #(MACH_TYPE_AT91RM9200DK & 0xff)
diff --git a/arch/arm/boot/compressed/ll_char_wr.S b/arch/arm/boot/compressed/ll_char_wr.S
index d7bbd9da2fca..8517c8606b4a 100644
--- a/arch/arm/boot/compressed/ll_char_wr.S
+++ b/arch/arm/boot/compressed/ll_char_wr.S
@@ -77,7 +77,7 @@ Lrow4bpplp:
         subne   r1, r1, #1
         ldrneb  r7, [r6, r1]
         bne     Lrow4bpplp
-        LOADREGS(fd, sp!, {r4 - r7, pc})
+        ldmfd   sp!, {r4 - r7, pc}
 
 @
 @ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc)
@@ -105,7 +105,7 @@ Lrow8bpplp:
         subne   r1, r1, #1
         ldrneb  r7, [r6, r1]
         bne     Lrow8bpplp
-        LOADREGS(fd, sp!, {r4 - r7, pc})
+        ldmfd   sp!, {r4 - r7, pc}
 
 @
 @ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc)
@@ -127,7 +127,7 @@ Lrow1bpp:
         strb    r7, [r0], r5
         mov     r7, r7, lsr #8
         strb    r7, [r0], r5
-        LOADREGS(fd, sp!, {r4 - r7, pc})
+        ldmfd   sp!, {r4 - r7, pc}
 
         .bss
 ENTRY(con_charconvtable)