From 2c78726897055553c362de37cf0aad25bd67cba3 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Wed, 12 Feb 2014 14:45:02 +0200
Subject: PCI: Drop includes under cpu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The files affected do not make any PCI configuration calls.
If they did, the more correct includes would be pci_ops.h,
pci_defs.h and pci_ids.h.

Change-Id: I3e7f009371be6ea50318eaabf0c15500cb3f1210
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5200
Reviewed-by: Aaron Durbin <adurbin@google.com>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
---
 src/cpu/amd/agesa/family10/model_10_init.c       | 1 -
 src/cpu/amd/agesa/family12/model_12_init.c       | 1 -
 src/cpu/amd/agesa/family14/model_14_init.c       | 1 -
 src/cpu/amd/agesa/family15/model_15_init.c       | 1 -
 src/cpu/amd/agesa/family15tn/model_15_init.c     | 1 -
 src/cpu/amd/agesa/family16kb/model_16_init.c     | 1 -
 src/cpu/amd/agesa/s3_resume.c                    | 4 ----
 src/cpu/amd/geode_gx1/geode_gx1_init.c           | 1 -
 src/cpu/amd/geode_gx2/cpubug.c                   | 2 --
 src/cpu/amd/geode_gx2/geode_gx2_init.c           | 1 -
 src/cpu/amd/geode_lx/geode_lx_init.c             | 1 -
 src/cpu/intel/ep80579/ep80579_init.c             | 1 -
 src/cpu/intel/fsp_model_206ax/acpi.c             | 1 -
 src/cpu/intel/fsp_model_206ax/model_206ax_init.c | 1 -
 src/cpu/intel/haswell/acpi.c                     | 1 -
 src/cpu/intel/haswell/haswell_init.c             | 1 -
 src/cpu/intel/model_1067x/model_1067x_init.c     | 1 -
 src/cpu/intel/model_106cx/model_106cx_init.c     | 1 -
 src/cpu/intel/model_2065x/acpi.c                 | 1 -
 src/cpu/intel/model_2065x/model_2065x_init.c     | 1 -
 src/cpu/intel/model_206ax/acpi.c                 | 1 -
 src/cpu/intel/model_206ax/model_206ax_init.c     | 1 -
 src/cpu/intel/model_65x/model_65x_init.c         | 1 -
 src/cpu/intel/model_68x/model_68x_init.c         | 1 -
 src/cpu/intel/model_69x/model_69x_init.c         | 1 -
 src/cpu/intel/model_6bx/model_6bx_init.c         | 1 -
 src/cpu/intel/model_6dx/model_6dx_init.c         | 1 -
 src/cpu/intel/model_6ex/model_6ex_init.c         | 1 -
 src/cpu/intel/model_6fx/model_6fx_init.c         | 1 -
 src/cpu/intel/model_6xx/model_6xx_init.c         | 1 -
 src/cpu/intel/model_f0x/model_f0x_init.c         | 1 -
 src/cpu/intel/model_f1x/model_f1x_init.c         | 1 -
 src/cpu/intel/model_f2x/model_f2x_init.c         | 1 -
 src/cpu/intel/model_f3x/model_f3x_init.c         | 1 -
 src/cpu/intel/model_f4x/model_f4x_init.c         | 1 -
 35 files changed, 39 deletions(-)

(limited to 'src')

diff --git a/src/cpu/amd/agesa/family10/model_10_init.c b/src/cpu/amd/agesa/family10/model_10_init.c
index 899a3c4d32..6fbfd1aa34 100644
--- a/src/cpu/amd/agesa/family10/model_10_init.c
+++ b/src/cpu/amd/agesa/family10/model_10_init.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/pae.h>
diff --git a/src/cpu/amd/agesa/family12/model_12_init.c b/src/cpu/amd/agesa/family12/model_12_init.c
index 0dae912614..635bd81b45 100644
--- a/src/cpu/amd/agesa/family12/model_12_init.c
+++ b/src/cpu/amd/agesa/family12/model_12_init.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/pae.h>
diff --git a/src/cpu/amd/agesa/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c
index 7ae2b2405e..1a97f2c462 100644
--- a/src/cpu/amd/agesa/family14/model_14_init.c
+++ b/src/cpu/amd/agesa/family14/model_14_init.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/pae.h>
diff --git a/src/cpu/amd/agesa/family15/model_15_init.c b/src/cpu/amd/agesa/family15/model_15_init.c
index ea7e663d03..a755e1c20c 100644
--- a/src/cpu/amd/agesa/family15/model_15_init.c
+++ b/src/cpu/amd/agesa/family15/model_15_init.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/pae.h>
diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c
index aebc27bd41..f396201181 100644
--- a/src/cpu/amd/agesa/family15tn/model_15_init.c
+++ b/src/cpu/amd/agesa/family15tn/model_15_init.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/pae.h>
diff --git a/src/cpu/amd/agesa/family16kb/model_16_init.c b/src/cpu/amd/agesa/family16kb/model_16_init.c
index 2964b783ae..734d9ef7ef 100644
--- a/src/cpu/amd/agesa/family16kb/model_16_init.c
+++ b/src/cpu/amd/agesa/family16kb/model_16_init.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/pae.h>
diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c
index 558fc75c73..e056a18b03 100644
--- a/src/cpu/amd/agesa/s3_resume.c
+++ b/src/cpu/amd/agesa/s3_resume.c
@@ -26,10 +26,6 @@
 #include <cpu/x86/cache.h>
 #include <cbmem.h>
 #include <device/device.h>
-#include <device/pci.h>
-#ifndef __PRE_RAM__
-#include <device/pci_ops.h>
-#endif
 #include <arch/io.h>
 #include <arch/acpi.h>
 #include <string.h>
diff --git a/src/cpu/amd/geode_gx1/geode_gx1_init.c b/src/cpu/amd/geode_gx1/geode_gx1_init.c
index 60f9473470..8fbf50742c 100644
--- a/src/cpu/amd/geode_gx1/geode_gx1_init.c
+++ b/src/cpu/amd/geode_gx1/geode_gx1_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/amd/geode_gx2/cpubug.c b/src/cpu/amd/geode_gx2/cpubug.c
index eddc92408e..b6824adf80 100644
--- a/src/cpu/amd/geode_gx2/cpubug.c
+++ b/src/cpu/amd/geode_gx2/cpubug.c
@@ -2,8 +2,6 @@
 #include <arch/io.h>
 #include <stdint.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/amd/gx2def.h>
diff --git a/src/cpu/amd/geode_gx2/geode_gx2_init.c b/src/cpu/amd/geode_gx2/geode_gx2_init.c
index 7e481b5390..b8f56db461 100644
--- a/src/cpu/amd/geode_gx2/geode_gx2_init.c
+++ b/src/cpu/amd/geode_gx2/geode_gx2_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/amd/geode_lx/geode_lx_init.c b/src/cpu/amd/geode_lx/geode_lx_init.c
index e2eded0123..cd931a490b 100644
--- a/src/cpu/amd/geode_lx/geode_lx_init.c
+++ b/src/cpu/amd/geode_lx/geode_lx_init.c
@@ -24,7 +24,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/intel/ep80579/ep80579_init.c b/src/cpu/intel/ep80579/ep80579_init.c
index 22166b16ca..433636d065 100644
--- a/src/cpu/intel/ep80579/ep80579_init.c
+++ b/src/cpu/intel/ep80579/ep80579_init.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/fsp_model_206ax/acpi.c b/src/cpu/intel/fsp_model_206ax/acpi.c
index 47e651f2ee..d24de06304 100644
--- a/src/cpu/intel/fsp_model_206ax/acpi.c
+++ b/src/cpu/intel/fsp_model_206ax/acpi.c
@@ -29,7 +29,6 @@
 #include <cpu/intel/speedstep.h>
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include "model_206ax.h"
 #include "chip.h"
 
diff --git a/src/cpu/intel/fsp_model_206ax/model_206ax_init.c b/src/cpu/intel/fsp_model_206ax/model_206ax_init.c
index c362ae3b55..5f4d3ced82 100644
--- a/src/cpu/intel/fsp_model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/fsp_model_206ax/model_206ax_init.c
@@ -22,7 +22,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <arch/acpi.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c
index 9e10c7527a..c67c8a1fc5 100644
--- a/src/cpu/intel/haswell/acpi.c
+++ b/src/cpu/intel/haswell/acpi.c
@@ -29,7 +29,6 @@
 #include <cpu/intel/speedstep.h>
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include "haswell.h"
 #include "chip.h"
 
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index f8d295e066..7c9beed6d8 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -22,7 +22,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <arch/acpi.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 2b151a3706..4779a517fb 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -22,7 +22,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index 0d96172827..356b86d88d 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c
index fa0dc95a00..49517ac47f 100644
--- a/src/cpu/intel/model_2065x/acpi.c
+++ b/src/cpu/intel/model_2065x/acpi.c
@@ -29,7 +29,6 @@
 #include <cpu/intel/speedstep.h>
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include "model_2065x.h"
 #include "chip.h"
 
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index 6df45a45e8..2cbe906e83 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -22,7 +22,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <arch/acpi.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 80ed4ba94c..f97c1eec0c 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -29,7 +29,6 @@
 #include <cpu/intel/speedstep.h>
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include "model_206ax.h"
 #include "chip.h"
 
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 60288010da..26fd721e65 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -22,7 +22,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <arch/acpi.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/intel/model_65x/model_65x_init.c b/src/cpu/intel/model_65x/model_65x_init.c
index 69141221eb..a9f1811c76 100644
--- a/src/cpu/intel/model_65x/model_65x_init.c
+++ b/src/cpu/intel/model_65x/model_65x_init.c
@@ -20,7 +20,6 @@
 
 #include <stdint.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
diff --git a/src/cpu/intel/model_68x/model_68x_init.c b/src/cpu/intel/model_68x/model_68x_init.c
index 4bb9b5634c..c2f0002e36 100644
--- a/src/cpu/intel/model_68x/model_68x_init.c
+++ b/src/cpu/intel/model_68x/model_68x_init.c
@@ -22,7 +22,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_69x/model_69x_init.c b/src/cpu/intel/model_69x/model_69x_init.c
index 9ee7424eb7..4339274505 100644
--- a/src/cpu/intel/model_69x/model_69x_init.c
+++ b/src/cpu/intel/model_69x/model_69x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c
index e06665a2c2..083109c311 100644
--- a/src/cpu/intel/model_6bx/model_6bx_init.c
+++ b/src/cpu/intel/model_6bx/model_6bx_init.c
@@ -22,7 +22,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_6dx/model_6dx_init.c b/src/cpu/intel/model_6dx/model_6dx_init.c
index 06236a3b3b..18c2fa4088 100644
--- a/src/cpu/intel/model_6dx/model_6dx_init.c
+++ b/src/cpu/intel/model_6dx/model_6dx_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index 4dc642a61e..30d3f10b7c 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -21,7 +21,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index 39aa8e9720..034dc9ca7f 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -21,7 +21,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c
index e81f9aebe8..9b92dcc78f 100644
--- a/src/cpu/intel/model_6xx/model_6xx_init.c
+++ b/src/cpu/intel/model_6xx/model_6xx_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_f0x/model_f0x_init.c b/src/cpu/intel/model_f0x/model_f0x_init.c
index 8d8118224e..ca40515444 100644
--- a/src/cpu/intel/model_f0x/model_f0x_init.c
+++ b/src/cpu/intel/model_f0x/model_f0x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_f1x/model_f1x_init.c b/src/cpu/intel/model_f1x/model_f1x_init.c
index b294c6193a..dbb5cd09f7 100644
--- a/src/cpu/intel/model_f1x/model_f1x_init.c
+++ b/src/cpu/intel/model_f1x/model_f1x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c
index 9e8fbfc84f..53eb75ee54 100644
--- a/src/cpu/intel/model_f2x/model_f2x_init.c
+++ b/src/cpu/intel/model_f2x/model_f2x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c
index 5752347943..f8d9ca6640 100644
--- a/src/cpu/intel/model_f3x/model_f3x_init.c
+++ b/src/cpu/intel/model_f3x/model_f3x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_f4x/model_f4x_init.c b/src/cpu/intel/model_f4x/model_f4x_init.c
index 80d7dc8056..260b60ac9c 100644
--- a/src/cpu/intel/model_f4x/model_f4x_init.c
+++ b/src/cpu/intel/model_f4x/model_f4x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
-- 
cgit v1.2.3