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-arm920.S b/arch/arm/mm/proc-arm920.S
index 0170d4f466ea..28cdb060df45 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -417,6 +417,7 @@ arm920_crval:
         .type   arm920_processor_functions, #object
 arm920_processor_functions:
         .word   v4t_early_abort
+        .word   pabort_noifar
         .word   cpu_arm920_proc_init
         .word   cpu_arm920_proc_fin
         .word   cpu_arm920_reset
@@ -424,7 +425,6 @@ arm920_processor_functions:
         .word   cpu_arm920_dcache_clean_area
         .word   cpu_arm920_switch_mm
         .word   cpu_arm920_set_pte_ext
-        .word   pabort_noifar
         .size   arm920_processor_functions, . - arm920_processor_functions
 
         .section ".rodata"