From: Tony Lindgren Date: Tue, 9 Sep 2008 15:24:26 +0000 (-0700) Subject: Revert some merge-errors X-Git-Tag: v2.6.27-omap1~238 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c1e65dbd68c5d91bca29d057501ba1aeb83fd954;p=linux-2.6-omap-h63xx.git Revert some merge-errors As pointed out by Russell King. Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore index bbe9905f3ae..ce1c5ff746e 100644 --- a/arch/arm/boot/.gitignore +++ b/arch/arm/boot/.gitignore @@ -1,5 +1,5 @@ Image zImage -uImage xipImage bootpImage +uImage diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 137e97f765d..d42f89b7760 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -55,7 +55,7 @@ #elif defined(CONFIG_ARCH_S3C2410) .macro loadsp, rb mov \rb, #0x50000000 - add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT + add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT .endm #else .macro loadsp, rb @@ -782,7 +782,6 @@ __armv7_mmu_cache_flush: mcr p15, 0, r10, c7, c14, 0 @ clean+invalidate D b iflush hierarchical: - adr sp, no_cache_id @ non-v7 code is temp stack stmfd sp!, {r0-r5, r7, r9-r11} mrc p15, 1, r0, c0, c0, 1 @ read clidr ands r3, r0, #0x7000000 @ extract loc from clidr