[PATCH] OMAP: remove merge artifacts from the PandaBoard file

Mircea Gherzan mgherzan at gmail.com
Sat Mar 10 09:53:15 UTC 2012


Signed-off-by: Mircea Gherzan <mgherzan at gmail.com>
---
 arch/arm/mach-omap2/board-omap4panda.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 084e0a6..77ab174 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -63,10 +63,6 @@
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
 #define HDMI_GPIO_HPD  63 /* Hotplug detect */
 
-<<<<<<< current
-/* wl127x BT, FM, GPS connectivity chip */
-static int wl1271_gpios[] = {46, -1, -1};
-=======
 #define FIXED_REG_VWLAN_ID	0
 #define FIXED_REG_V2V1_ID	1
 #define FIXED_REG_V1V8_ID	2
@@ -74,7 +70,6 @@ static int wl1271_gpios[] = {46, -1, -1};
 /* wl127x BT, FM, GPS connectivity chip */
 static int wl1271_gpios[] = {46, -1, -1};
 
->>>>>>> patched
 static struct platform_device wl1271_device = {
 	.name	= "kim",
 	.id	= -1,
-- 
1.7.9.1




More information about the linaro-dev mailing list