From 5e34934ff044d74f815e181e659f82e6ebd3f406 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Thu, 30 Jan 2020 09:45:59 +0100
Subject: [PATCH] ANDROID: handle merge issue in arch/arm64/include/asm/lse.h

For some reason a duplicated line ended up in here.

Thanks to Matthias for pointing it out.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7ebeddcd4a9bc210edd69d9ce5e9d3a30a6ef469
---
 arch/arm64/include/asm/lse.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h
index 63ece2a7f934..d429f7701c36 100644
--- a/arch/arm64/include/asm/lse.h
+++ b/arch/arm64/include/asm/lse.h
@@ -8,8 +8,6 @@
 
 #define __LSE_PREAMBLE	".arch armv8-a+lse\n"
 
-#define __LSE_PREAMBLE	".arch armv8-a+lse\n"
-
 #include <linux/compiler_types.h>
 #include <linux/export.h>
 #include <linux/jump_label.h>