From e132d5711df1bec0a83eb9deb0f892bb22579df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sat, 2 Mar 2019 19:06:17 +0200
Subject: [PATCH] Fix <io.h> includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These resolved to <device/oprom/include/io.h> which
included <arch/io.h> that we really wanted.

Change-Id: I9aa0bdf34cd1d53e20b4494c7986f0878f4fd840
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31693
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/amd/stoneyridge/smbus.c          | 2 +-
 src/soc/intel/denverton_ns/uart_debug.c  | 1 -
 src/southbridge/amd/agesa/hudson/smbus.c | 2 +-
 src/southbridge/amd/pi/hudson/smbus.c    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/soc/amd/stoneyridge/smbus.c b/src/soc/amd/stoneyridge/smbus.c
index 21750d8be9..c4a022a9a9 100644
--- a/src/soc/amd/stoneyridge/smbus.c
+++ b/src/soc/amd/stoneyridge/smbus.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <io.h>
+#include <arch/io.h>
 #include <stdint.h>
 #include <soc/smbus.h>
 #include <soc/southbridge.h>
diff --git a/src/soc/intel/denverton_ns/uart_debug.c b/src/soc/intel/denverton_ns/uart_debug.c
index 5911a451e5..f7d523ea5e 100644
--- a/src/soc/intel/denverton_ns/uart_debug.c
+++ b/src/soc/intel/denverton_ns/uart_debug.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <io.h>
 #include <soc/uart.h>
 
 #define MY_PCI_DEV(SEGBUS, DEV, FN) \
diff --git a/src/southbridge/amd/agesa/hudson/smbus.c b/src/southbridge/amd/agesa/hudson/smbus.c
index 33bc91774b..783c324f95 100644
--- a/src/southbridge/amd/agesa/hudson/smbus.c
+++ b/src/southbridge/amd/agesa/hudson/smbus.c
@@ -16,7 +16,7 @@
 #ifndef _HUDSON_SMBUS_C_
 #define _HUDSON_SMBUS_C_
 
-#include <io.h>
+#include <arch/io.h>
 #include <stdint.h>
 #include "smbus.h"
 
diff --git a/src/southbridge/amd/pi/hudson/smbus.c b/src/southbridge/amd/pi/hudson/smbus.c
index 33bc91774b..783c324f95 100644
--- a/src/southbridge/amd/pi/hudson/smbus.c
+++ b/src/southbridge/amd/pi/hudson/smbus.c
@@ -16,7 +16,7 @@
 #ifndef _HUDSON_SMBUS_C_
 #define _HUDSON_SMBUS_C_
 
-#include <io.h>
+#include <arch/io.h>
 #include <stdint.h>
 #include "smbus.h"