From: Valentin Rothberg <valentinrothberg@gmail.com>
Date: Thu, 30 Apr 2015 13:36:03 +0000 (+0100)
Subject: ARM: 8349/1: arch/arm/mm/proc-arm925.S: remove dead #ifdef block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=13f2fa7cb33d82b95e1e1dab8c95fa619b49f418;p=linux.git

ARM: 8349/1: arch/arm/mm/proc-arm925.S: remove dead #ifdef block

The block could never be compiled;  CPU_ICACHE_STREAMING_DISABLE has not
been defined in Kconfig since the very first Git commit.  Hence, we can
safely remove the entire block.

Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index ede8c54ab4aa7..32a47cc19076c 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -441,9 +441,6 @@ ENTRY(cpu_arm925_set_pte_ext)
 	.type	__arm925_setup, #function
 __arm925_setup:
 	mov	r0, #0
-#if defined(CONFIG_CPU_ICACHE_STREAMING_DISABLE)
-        orr     r0,r0,#1 << 7
-#endif
 
 	/* Transparent on, D-cache clean & flush mode. See  NOTE2 above */
         orr     r0,r0,#1 << 1			@ transparent mode on