diff options
author | Olof Johansson <olof@lixom.net> | 2012-04-14 22:17:47 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-04-14 22:17:47 -0700 |
commit | 17d2f847e6aa1181024cb881fdc6cbad18f11b04 (patch) | |
tree | d6a1c35140a566a3b4bdf032b597cf96f5758e95 /arch/arm/boot | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
parent | c65f2abf54a6d07260f1fa64773154e1d7047961 (diff) |
Merge branch 'ixp2xxx/removal' into next/cleanup
* ixp2xxx/removal:
ARM: remove ixp23xx and ixp2000 platforms
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/compressed/head-xscale.S | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index aa5ee49c5c5a..6ab0599c02dd 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S @@ -32,10 +32,3 @@ __XScale_start: bic r0, r0, #0x1000 @ clear Icache mcr p15, 0, r0, c1, c0, 0 -#ifdef CONFIG_ARCH_IXP2000 - mov r1, #-1 - mov r0, #0xd6000000 - str r1, [r0, #0x14] - str r1, [r0, #0x18] -#endif - |