X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-armv.S;h=5639f1b618f9a80d7a8a9dccaff6c8ea2e1068fb;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=44cd347847cb9ecfecdb7e00363556329db3832d;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 44cd34784..5639f1b61 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -464,7 +464,7 @@ ENTRY(soft_irq_mask)
 		.macro	irq_prio_table
 		.endm
 
-#elif defined(CONFIG_ARCH_VERSATILE)
+#elif defined(CONFIG_ARCH_VERSATILE_PB)
 
 		.macro	disable_fiq
 		.endm
@@ -1657,8 +1657,6 @@ __stubs_end:
 ENTRY(__trap_init)
 		stmfd	sp!, {r4 - r6, lr}
 
-		mov	r0, #0xff000000
-		orr	r0, r0, #0x00ff0000		@ high vectors position
 		adr	r1, .LCvectors			@ set up the vectors
 		ldmia	r1, {r1, r2, r3, r4, r5, r6, ip, lr}
 		stmia	r0, {r1, r2, r3, r4, r5, r6, ip, lr}