From 89f888fbed3f387c7a31c785b0236a7c01c69b74 Mon Sep 17 00:00:00 2001
From: Retic1337 <cameronbanna@gmail.com>
Date: Sun, 26 Sep 2021 20:30:41 -0700
Subject: [PATCH] changes

---
 app/drivers/Kconfig      | 4 ----
 app/drivers/gpio/Kconfig | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)
 create mode 100644 app/drivers/gpio/Kconfig

diff --git a/app/drivers/Kconfig b/app/drivers/Kconfig
index ec7cf1c0..87590825 100644
--- a/app/drivers/Kconfig
+++ b/app/drivers/Kconfig
@@ -4,8 +4,4 @@
 rsource "gpio/Kconfig"
 rsource "kscan/Kconfig"
 rsource "sensor/Kconfig"
-<<<<<<< HEAD
 rsource "led/Kconfig"
-=======
-rsource "display/Kconfig"
->>>>>>> e6645882c32454251466949fa9a6447b195acd72
diff --git a/app/drivers/gpio/Kconfig b/app/drivers/gpio/Kconfig
new file mode 100644
index 00000000..4b453ad5
--- /dev/null
+++ b/app/drivers/gpio/Kconfig
@@ -0,0 +1 @@
+rsource "Kconfig.mcp23017"
\ No newline at end of file