diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 11:36:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 11:36:11 -0400 |
| commit | 8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06 (patch) | |
| tree | a5fd9796af13c084be5d6d5924c3c3430b1866b8 /arch/arm/mm/proc-xscale.S | |
| parent | 2444e56b0c08e6f3e3877583841a1213e3263d98 (diff) | |
| parent | 4a1fd556c1f1fbd6d9d6739efec042324732b697 (diff) | |
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
Diffstat (limited to 'arch/arm/mm/proc-xscale.S')
| -rw-r--r-- | arch/arm/mm/proc-xscale.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S index 1a6d89823dff..2dd85273976f 100644 --- a/arch/arm/mm/proc-xscale.S +++ b/arch/arm/mm/proc-xscale.S | |||
| @@ -527,6 +527,7 @@ xscale_crval: | |||
| 527 | .type xscale_processor_functions, #object | 527 | .type xscale_processor_functions, #object |
| 528 | ENTRY(xscale_processor_functions) | 528 | ENTRY(xscale_processor_functions) |
| 529 | .word v5t_early_abort | 529 | .word v5t_early_abort |
| 530 | .word pabort_noifar | ||
| 530 | .word cpu_xscale_proc_init | 531 | .word cpu_xscale_proc_init |
| 531 | .word cpu_xscale_proc_fin | 532 | .word cpu_xscale_proc_fin |
| 532 | .word cpu_xscale_reset | 533 | .word cpu_xscale_reset |
| @@ -534,7 +535,6 @@ ENTRY(xscale_processor_functions) | |||
| 534 | .word cpu_xscale_dcache_clean_area | 535 | .word cpu_xscale_dcache_clean_area |
| 535 | .word cpu_xscale_switch_mm | 536 | .word cpu_xscale_switch_mm |
| 536 | .word cpu_xscale_set_pte_ext | 537 | .word cpu_xscale_set_pte_ext |
| 537 | .word pabort_noifar | ||
| 538 | .size xscale_processor_functions, . - xscale_processor_functions | 538 | .size xscale_processor_functions, . - xscale_processor_functions |
| 539 | 539 | ||
| 540 | .section ".rodata" | 540 | .section ".rodata" |