From 5a4a99cf436cbf867f7030dffc3e9b11404e51e8 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 9 Aug 2019 09:14:33 -0600
Subject: [PATCH] Fix compilation of bootblock

---
 src/mainboard/system76/kbl-u/bootblock.c | 3 +--
 src/mainboard/system76/whl-u/bootblock.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mainboard/system76/kbl-u/bootblock.c b/src/mainboard/system76/kbl-u/bootblock.c
index 7cf57e2835..3a24b283bc 100644
--- a/src/mainboard/system76/kbl-u/bootblock.c
+++ b/src/mainboard/system76/kbl-u/bootblock.c
@@ -15,8 +15,7 @@
 
 #include <bootblock_common.h>
 #include <gpio.h>
-#include <soc/gpio.h>
-#include <variant/gpio.h>
+#include "gpio.h"
 
 void bootblock_mainboard_init(void) {
 	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
diff --git a/src/mainboard/system76/whl-u/bootblock.c b/src/mainboard/system76/whl-u/bootblock.c
index 7cf57e2835..3a24b283bc 100644
--- a/src/mainboard/system76/whl-u/bootblock.c
+++ b/src/mainboard/system76/whl-u/bootblock.c
@@ -15,8 +15,7 @@
 
 #include <bootblock_common.h>
 #include <gpio.h>
-#include <soc/gpio.h>
-#include <variant/gpio.h>
+#include "gpio.h"
 
 void bootblock_mainboard_init(void) {
 	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));