aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-09-18 18:02:25 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-25 05:25:34 -0400
commit98954df6917cb8f7e65f4f0f79ed641112fcf6b6 (patch)
tree64c6d17b7f05b8b1d7322f9d05201e374d779c6b /arch/arm/boot
parentcdf3f8e0387e81477dee72ecb2e3be28feac05c8 (diff)
[ARM] 3816/1: iop3xx: rename config symbols
Rename CONFIG_ARCH_IOP321 to CONFIG_ARCH_IOP32X and CONFIG_ARCH_IOP331 to CONFIG_ARCH_IOP33X. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.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.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 14a9ff9c68df..d7ecc7ece82d 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -42,7 +42,7 @@
42 add \rb, \rb, #0x00010000 @ Ser1 42 add \rb, \rb, #0x00010000 @ Ser1
43#endif 43#endif
44 .endm 44 .endm
45#elif defined(CONFIG_ARCH_IOP331) 45#elif defined(CONFIG_ARCH_IOP33X)
46 .macro loadsp, rb 46 .macro loadsp, rb
47 mov \rb, #0xff000000 47 mov \rb, #0xff000000
48 orr \rb, \rb, #0x00ff0000 48 orr \rb, \rb, #0x00ff0000