From 4bfaccde0a0b7c785af10ab57a584b150a264a19 Mon Sep 17 00:00:00 2001
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
Date: Tue, 9 Apr 2013 13:37:20 +0100
Subject: [PATCH] --- yaml --- r: 372127 b: refs/heads/master c:
 b361d61dc1aaa9bdac0a0995e443c12146d916fd h: refs/heads/master i:   372125:
 1e2d8ecfe5a80abd4c984435320147fe3363d9c2   372123:
 b00657122f97b8c15450776477e5247f3384db56   372119:
 b64dbfe8a73f491d0919c95fa5e30f9bbfeb24f5   372111:
 3cd6bf86e756a80e836c501010c8500f4c7ed14e   372095:
 add6ba461db02f8d1c0cfa588aeefcded37d7e8a v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/mm/proc-v7.S | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 626a77568478..437fc32f9bc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd0f67f4747797f36f0c6bab7fed6a1f2448476d
+refs/heads/master: b361d61dc1aaa9bdac0a0995e443c12146d916fd
diff --git a/trunk/arch/arm/mm/proc-v7.S b/trunk/arch/arm/mm/proc-v7.S
index 37716b0508e1..4fa28acaf7f9 100644
--- a/trunk/arch/arm/mm/proc-v7.S
+++ b/trunk/arch/arm/mm/proc-v7.S
@@ -402,6 +402,8 @@ __v7_ca9mp_proc_info:
 	__v7_proc __v7_ca9mp_setup
 	.size	__v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
 
+#endif	/* CONFIG_ARM_LPAE */
+
 	/*
 	 * Marvell PJ4B processor.
 	 */
@@ -411,7 +413,6 @@ __v7_pj4b_proc_info:
 	.long	0xfffffff0
 	__v7_proc __v7_pj4b_setup
 	.size	__v7_pj4b_proc_info, . - __v7_pj4b_proc_info
-#endif	/* CONFIG_ARM_LPAE */
 
 	/*
 	 * ARM Ltd. Cortex A7 processor.