From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 3 Mar 2012 12:00:48 +0000 (+0000)
Subject: omap24xx: fix compile error with new binutils (#11072)
X-Git-Tag: v19.07.0-rc1~25316
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d5ec28c734804496aaf1118a47dfe47c4257efcf;p=openwrt%2Fstaging%2Fhauke.git

omap24xx: fix compile error with new binutils (#11072)

SVN-Revision: 30798
---

diff --git a/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch b/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch
index 0c26af2ab1..f341051c46 100644
--- a/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch
+++ b/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch
@@ -2039,7 +2039,7 @@
  		VMLINUX_SYMBOL(__entry_text_start) = .;			\
 --- a/arch/arm/kernel/sleep.S
 +++ b/arch/arm/kernel/sleep.S
-@@ -85,12 +85,14 @@ ENDPROC(cpu_resume_mmu)
+@@ -85,11 +85,13 @@ ENDPROC(cpu_resume_mmu)
  	.ltorg
  	.align	5
  cpu_resume_turn_mmu_on:
@@ -2049,11 +2049,10 @@
  	mov	r1, r1
  	mov	r1, r1
  	mov	pc, r3			@ jump to virtual address
- ENDPROC(cpu_resume_turn_mmu_on)
 +	.popsection
+ ENDPROC(cpu_resume_turn_mmu_on)
  cpu_resume_after_mmu:
  	str	r5, [r2, r4, lsl #2]	@ restore old mapping
- 	mcr	p15, 0, r0, c1, c0, 0	@ turn on D-cache
 --- a/arch/arm/mach-omap2/io.c
 +++ b/arch/arm/mach-omap2/io.c
 @@ -36,7 +36,7 @@