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, 1 insertions, 33 deletions

diff --git a/arch/arm/mm/copypage-v3.S b/arch/arm/mm/copypage-v3.S
index 3c58ebbf0359..2ee394b11bcb 100644
--- a/arch/arm/mm/copypage-v3.S
+++ b/arch/arm/mm/copypage-v3.S
@@ -35,7 +35,7 @@ ENTRY(v3_copy_user_page)
         stmia   r0!, {r3, r4, ip, lr}           @       4
         ldmneia r1!, {r3, r4, ip, lr}           @       4
         bne     1b                              @       1
-        LOADREGS(fd, sp!, {r4, pc})             @       3
+        ldmfd   sp!, {r4, pc}                   @       3
 
         .align  5
 /*
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index ee6f15298735..09b1a41a6de8 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -29,38 +29,6 @@
 #define TTB_RGN_WT      (2 << 3)
 #define TTB_RGN_WB      (3 << 3)
 
-        .macro  cpsie, flags
-        .ifc \flags, f
-        .long   0xf1080040
-        .exitm
-        .endif
-        .ifc \flags, i
-        .long   0xf1080080
-        .exitm
-        .endif
-        .ifc \flags, if
-        .long   0xf10800c0
-        .exitm
-        .endif
-        .err
-        .endm
-
-        .macro  cpsid, flags
-        .ifc \flags, f
-        .long   0xf10c0040
-        .exitm
-        .endif
-        .ifc \flags, i
-        .long   0xf10c0080
-        .exitm
-        .endif
-        .ifc \flags, if
-        .long   0xf10c00c0
-        .exitm
-        .endif
-        .err
-        .endm
-
 ENTRY(cpu_v6_proc_init)
         mov     pc, lr