From 10605e00b9df04121bcd3fa54ffa3d7f178cf74a Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Fri, 23 Jun 2017 19:14:07 +0900
Subject: [PATCH] Resolve confict

---
 src/main/drivers/resource.c | 1 +
 src/main/drivers/resource.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/drivers/resource.c b/src/main/drivers/resource.c
index 0bdf92ae76..13cdf530b1 100644
--- a/src/main/drivers/resource.c
+++ b/src/main/drivers/resource.c
@@ -62,6 +62,7 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = {
     "TRANSPONDER",
     "VTX",
     "COMPASS_CS",
+    "SPI_PREINIT",
     "RX_BIND_PLUG",
 };
 
diff --git a/src/main/drivers/resource.h b/src/main/drivers/resource.h
index aae4598151..f79990ea89 100644
--- a/src/main/drivers/resource.h
+++ b/src/main/drivers/resource.h
@@ -62,6 +62,7 @@ typedef enum {
     OWNER_TRANSPONDER,
     OWNER_VTX,
     OWNER_COMPASS_CS,
+    OWNER_SPI_PREINIT,
     OWNER_RX_BIND_PLUG,
     OWNER_TOTAL_COUNT
 } resourceOwner_e;