Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f
  [ARM] 5010/1: htc-pasic3: remove unused defines and includes
  [ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84a
  [ARM] fix lh7a40x/kev7a400 build

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index 4db3d6299a2b..9818195dbf11 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -216,6 +216,7 @@ sa110_crval:
         .type   sa110_processor_functions, #object
 ENTRY(sa110_processor_functions)
         .word   v4_early_abort
+        .word   pabort_noifar
         .word   cpu_sa110_proc_init
         .word   cpu_sa110_proc_fin
         .word   cpu_sa110_reset
@@ -223,7 +224,6 @@ ENTRY(sa110_processor_functions)
         .word   cpu_sa110_dcache_clean_area
         .word   cpu_sa110_switch_mm
         .word   cpu_sa110_set_pte_ext
-        .word   pabort_noifar
         .size   sa110_processor_functions, . - sa110_processor_functions
 
         .section ".rodata"