aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authoreric miao <eric.y.miao@gmail.com>2007-08-29 05:15:41 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-10-12 16:15:28 -0400
commit37c2f779a4eabf7c6a39e6f9ded0ec3471ed5995 (patch)
treecb981f1c04144195ce2490158ba58918111460ed /arch/arm/boot
parentcd272ab01141c908ccccb068e6d38b7fcd3240ac (diff)
[ARM] 4558/1: pxa: remove MACH_TYPE_LUBBOCK assignment and leave it to boot loader
since both u-boot and blob support passing MACH_TYPE_LUBBOCK to the kernel, it should be quite safe to remove this Signed-off-by: eric miao <eric.y.miao@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/compressed/head-xscale.S4
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 236bbe578312..67ea99ef6521 100644
--- a/arch/arm/boot/compressed/head-xscale.S
+++ b/arch/arm/boot/compressed/head-xscale.S
@@ -33,10 +33,6 @@ __XScale_start:
33 bic r0, r0, #0x1000 @ clear Icache 33 bic r0, r0, #0x1000 @ clear Icache
34 mcr p15, 0, r0, c1, c0, 0 34 mcr p15, 0, r0, c1, c0, 0
35 35
36#ifdef CONFIG_ARCH_LUBBOCK
37 mov r7, #MACH_TYPE_LUBBOCK
38#endif
39
40#ifdef CONFIG_ARCH_COTULLA_IDP 36#ifdef CONFIG_ARCH_COTULLA_IDP
41 mov r7, #MACH_TYPE_COTULLA_IDP 37 mov r7, #MACH_TYPE_COTULLA_IDP
42#endif 38#endif