diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /arch/arm/boot | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 7b1f31295a0a..77d614232d81 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -624,6 +624,12 @@ proc_types: | |||
| 624 | b __armv4_mmu_cache_off | 624 | b __armv4_mmu_cache_off |
| 625 | b __armv4_mmu_cache_flush | 625 | b __armv4_mmu_cache_flush |
| 626 | 626 | ||
| 627 | .word 0x56056930 | ||
| 628 | .word 0xff0ffff0 @ PXA935 | ||
| 629 | b __armv4_mmu_cache_on | ||
| 630 | b __armv4_mmu_cache_off | ||
| 631 | b __armv4_mmu_cache_flush | ||
| 632 | |||
| 627 | .word 0x56050000 @ Feroceon | 633 | .word 0x56050000 @ Feroceon |
| 628 | .word 0xff0f0000 | 634 | .word 0xff0f0000 |
| 629 | b __armv4_mmu_cache_on | 635 | b __armv4_mmu_cache_on |