From a09683c79b36341eebe25ace1d7c70c7e41d1f99 Mon Sep 17 00:00:00 2001
From: Lee Leahy <leroy.p.leahy@intel.com>
Date: Tue, 18 Apr 2017 12:38:29 -0700
Subject: [PATCH] UPSTREAM: soc/intel/quark: Move include of reg_access.h

Move include of reg_access.h from pci_devs.h to reg_access.c.

TEST=Build and run on Galileo Gen2

Change-Id: I0bd92d9594315278449ea9241c951a58e4ff44d9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e0a60383b2a8e42f54b6e8a650236d44ef6ff58c
Original-Change-Id: I0d2de96f51c56001cdd06c7974cbc649fde1e89c
Original-Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Original-Reviewed-on: https://review.coreboot.org/19355
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/482973
---
 src/soc/intel/quark/include/soc/pci_devs.h | 1 -
 src/soc/intel/quark/reg_access.c           | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/soc/intel/quark/include/soc/pci_devs.h b/src/soc/intel/quark/include/soc/pci_devs.h
index 2ddc2141b7..fc28dfe1d1 100644
--- a/src/soc/intel/quark/include/soc/pci_devs.h
+++ b/src/soc/intel/quark/include/soc/pci_devs.h
@@ -20,7 +20,6 @@
 
 #include <device/pci.h>
 #include <device/pci_def.h>
-#include <soc/reg_access.h>
 
 /* DEVICE 0 (Memory Controller Hub) */
 #define MC_BDF			PCI_DEV(PCI_BUS_NUMBER_QNC, MC_DEV, MC_FUN)
diff --git a/src/soc/intel/quark/reg_access.c b/src/soc/intel/quark/reg_access.c
index 5c4629bcc7..867a4316a8 100644
--- a/src/soc/intel/quark/reg_access.c
+++ b/src/soc/intel/quark/reg_access.c
@@ -20,6 +20,7 @@
 #include <console/console.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
+#include <soc/reg_access.h>
 
 static uint16_t get_gpe0_address(uint32_t reg_address)
 {