summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2012-10-01 15:53:14 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-11-01 22:21:12 +0100
commit41392df0d1e22aeaa694d5e8b6f58db198da423c (patch)
tree990601d2dd38d87f43d340c8113f5acc8d53a130 /src/cpu
parentbef3d347e8a21049d72407246a5d4ec1339b5601 (diff)
downloadcoreboot-41392df0d1e22aeaa694d5e8b6f58db198da423c.tar.xz
Merge cpu/intel/acpi.h into cpu/intel/speedstep.h
We had only some MSR definitions in there, which are used in speedstep related code. I think speedstep.h is the better and less confusing place for these. Change-Id: I1eddea72c1e2d3b2f651468b08b3c6f88b713149 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: http://review.coreboot.org/1655 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/intel/model_206ax/acpi.c1
-rw-r--r--src/cpu/intel/model_6ex/model_6ex_init.c1
-rw-r--r--src/cpu/intel/model_6fx/model_6fx_init.c1
-rw-r--r--src/cpu/intel/speedstep/acpi.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index c8c30a4986..80ed4ba94c 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -26,7 +26,6 @@
#include <arch/acpigen.h>
#include <arch/cpu.h>
#include <cpu/x86/msr.h>
-#include <cpu/intel/acpi.h>
#include <cpu/intel/speedstep.h>
#include <cpu/intel/turbo.h>
#include <device/device.h>
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index 1c8c72b3f0..9dbb137980 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -30,7 +30,6 @@
#include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h>
#include <cpu/intel/speedstep.h>
-#include <cpu/intel/acpi.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/name.h>
#include <usbdebug.h>
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index 106719ea7b..3cdfdc4dc9 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -29,7 +29,6 @@
#include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/intel/speedstep.h>
-#include <cpu/intel/acpi.h>
#include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/name.h>
diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c
index 5cc4c1d16e..249d9e47a8 100644
--- a/src/cpu/intel/speedstep/acpi.c
+++ b/src/cpu/intel/speedstep/acpi.c
@@ -25,7 +25,6 @@
#include <arch/acpigen.h>
#include <arch/cpu.h>
#include <cpu/x86/msr.h>
-#include <cpu/intel/acpi.h>
#include <cpu/intel/speedstep.h>
#include <device/device.h>