From f779899fbf7aac48023ceeab86450ef712a97bf4 Mon Sep 17 00:00:00 2001
From: IanSB <isb@clara.co.uk>
Date: Mon, 3 Dec 2018 15:57:51 +0000
Subject: [PATCH] Fix manual merge error

---
 src/rgb_to_fb.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rgb_to_fb.S b/src/rgb_to_fb.S
index de9b91e1..1e964922 100644
--- a/src/rgb_to_fb.S
+++ b/src/rgb_to_fb.S
@@ -13,6 +13,7 @@
 .global sw3counter
 .global vsync_line
 .global default_vsync_line
+.global lock_fail
 
 // ======================================================================
 // Macros