diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 16:15:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 16:15:00 -0700 |
| commit | 39b945a37bac2b692773a470890c8ba301485b15 (patch) | |
| tree | fe599a2cb77afa5dcfc3c07ef7f23933ea723f2e /arch/arm/boot/compressed/head-xscale.S | |
| parent | 203c80187eba037f2d6562e0d5847014746726dd (diff) | |
| parent | 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-armtip-x86-idle-2008-06-16_09.18_Mon
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: fix tosa.c build error
[ARM] 5067/1: _raw_write_can_lock macro bugfix
[ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
[ARM] 5068/1: PXA2xx Additional gpio definitions
[ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
[ARM] 5060/1: remove unnecessary include of asm/io.h
[ARM] fix AT91 include loops
Diffstat (limited to 'arch/arm/boot/compressed/head-xscale.S')
| -rw-r--r-- | arch/arm/boot/compressed/head-xscale.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index 67ea99ef6521..dd3fbd6766e1 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S @@ -33,10 +33,6 @@ __XScale_start: bic r0, r0, #0x1000 @ clear Icache mcr p15, 0, r0, c1, c0, 0 -#ifdef CONFIG_ARCH_COTULLA_IDP - mov r7, #MACH_TYPE_COTULLA_IDP -#endif - #ifdef CONFIG_ARCH_IXP2000 mov r1, #-1 mov r0, #0xd6000000 |