[coreboot-gerrit] Change in coreboot[master]: drivers/ipmi/ocp/ipmii_ocp.c: Clean up includes

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45968 )

Change subject: drivers/ipmi/ocp/ipmii_ocp.c: Clean up includes
......................................................................

drivers/ipmi/ocp/ipmii_ocp.c: Clean up includes

Remove #include "chip.h", which is not needed and causes a build
problem in a later change. Alphabetise the #includes.

Change-Id: If19ccd144bd352a196adccd75f9f6f139eae4e4a
Signed-off-by: Marc Jones 
---
M src/drivers/ipmi/ocp/ipmi_ocp.c
R src/soc/intel/xeon_sp/cpx/cpx.h
R src/soc/intel/xeon_sp/skx/skx.h
3 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/45968/1

diff --git a/src/drivers/ipmi/ocp/ipmi_ocp.c b/src/drivers/ipmi/ocp/ipmi_ocp.c
index f96ce24..459b8e2 100644
--- a/src/drivers/ipmi/ocp/ipmi_ocp.c
+++ b/src/drivers/ipmi/ocp/ipmi_ocp.c
@@ -7,14 +7,14 @@
  * end
  */

+#include <arch/cpu.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
+#include <drivers/ipmi/ipmi_kcs.h>
 #include <intelblocks/cpulib.h>
-#include <arch/cpu.h>
-#include "chip.h"
-#include "drivers/ipmi/ipmi_kcs.h"
+#include <string.h>
+
 #include "ipmi_ocp.h"

static int ipmi_set_processor_information_param1(struct device *dev)
diff --git a/src/soc/intel/xeon_sp/cpx/chip.h b/src/soc/intel/xeon_sp/cpx/cpx.h
similarity index 100%
rename from src/soc/intel/xeon_sp/cpx/chip.h
rename to src/soc/intel/xeon_sp/cpx/cpx.h
diff --git a/src/soc/intel/xeon_sp/skx/chip.h b/src/soc/intel/xeon_sp/skx/skx.h
similarity index 100%
rename from src/soc/intel/xeon_sp/skx/chip.h
rename to src/soc/intel/xeon_sp/skx/skx.h