12 files changed, 7 insertions, 26 deletions

diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index a379805cb6..7229b63ce9 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -30,7 +30,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/name.h>
 
 static const uint32_t microcode_updates[] = {
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index 4a621df31a..257bb44f7f 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -28,7 +28,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/name.h>
 #include <usbdebug.h>
 
diff --git a/src/cpu/intel/model_69x/model_69x_init.c b/src/cpu/intel/model_69x/model_69x_init.c
index b6ea237366..588ea69ab3 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/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -9,7 +8,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 static uint32_t microcode_updates[] = {
 	/*  Dummy terminator  */
@@ -19,7 +17,6 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_69x_init(device_t dev)
 {
 	/* Turn on caching if we haven't already */
@@ -37,6 +34,7 @@ static void model_69x_init(device_t dev)
 static struct device_operations cpu_dev_ops = {
 	.init     = model_69x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, 0x0690 }, /* Pentium M */
 	{ X86_VENDOR_INTEL, 0x0695 },
diff --git a/src/cpu/intel/model_6dx/model_6dx_init.c b/src/cpu/intel/model_6dx/model_6dx_init.c
index 26c1b99499..76b2e16f21 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/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -9,7 +8,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 static uint32_t microcode_updates[] = {
 	/*  Dummy terminator  */
@@ -19,7 +17,6 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_6dx_init(device_t dev)
 {
 	/* Turn on caching if we haven't already */
@@ -37,6 +34,7 @@ static void model_6dx_init(device_t dev)
 static struct device_operations cpu_dev_ops = {
 	.init     = model_6dx_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, 0x06D0 }, /* Pentium M on 90nm with 2MiB of L2 cache */
 	{ X86_VENDOR_INTEL, 0x06D6 }, /* Pentium M on 90nm with 2MiB of L2 cache */
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index b6a951335c..384b2bf68b 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/x86/cache.h>
-#include <cpu/x86/mtrr.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 c43b8debb1..0944aab955 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -30,7 +30,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/name.h>
 #include <usbdebug.h>
 
diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c
index 712cd0508d..5b8dd3519b 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/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -9,7 +8,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 static uint32_t microcode_updates[] = {
 	/* WARNING - Intel has a new data structure that has variable length
@@ -33,7 +31,6 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_6xx_init(device_t dev)
 {
 	/* Turn on caching if we haven't already */
diff --git a/src/cpu/intel/model_f0x/model_f0x_init.c b/src/cpu/intel/model_f0x/model_f0x_init.c
index 568d4d70ee..a06068e571 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/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -9,7 +8,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 /* 256KB cache */
 static uint32_t microcode_updates[] = {
@@ -25,7 +23,6 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_f0x_init(device_t dev)
 {
 	/* Turn on caching if we haven't already */
@@ -43,6 +40,7 @@ static void model_f0x_init(device_t dev)
 static struct device_operations cpu_dev_ops = {
 	.init     = model_f0x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, 0x0f0A },
 	{ 0, 0 },
diff --git a/src/cpu/intel/model_f1x/model_f1x_init.c b/src/cpu/intel/model_f1x/model_f1x_init.c
index f8dd1d85f7..f70e96a035 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/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -9,7 +8,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 /* 256KB cache */
 static uint32_t microcode_updates[] = {
@@ -25,7 +23,6 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_f1x_init(device_t dev)
 {
 	/* Turn on caching if we haven't already */
@@ -43,6 +40,7 @@ static void model_f1x_init(device_t dev)
 static struct device_operations cpu_dev_ops = {
 	.init     = model_f1x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, 0x0f12 },
 	{ 0, 0 },
diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c
index a77fe1ccd1..ead1c8a2bb 100644
--- a/src/cpu/intel/model_f2x/model_f2x_init.c
+++ b/src/cpu/intel/model_f2x/model_f2x_init.c
@@ -9,7 +9,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 /* 512KB cache */
 static uint32_t microcode_updates[] = {
@@ -49,6 +48,7 @@ static void model_f2x_init(device_t cpu)
 static struct device_operations cpu_dev_ops = {
 	.init     = model_f2x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, 0x0f22 },
 	{ X86_VENDOR_INTEL, 0x0f24 },
diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c
index f59ef5d371..f04ddcc0ce 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/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -10,7 +9,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 static uint32_t microcode_updates[] = {
 	/* WARNING - Intel has a new data structure that has variable length
@@ -29,7 +27,6 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_f3x_init(device_t cpu)
 {
 	/* Turn on caching if we haven't already */
@@ -50,6 +47,7 @@ static void model_f3x_init(device_t cpu)
 static struct device_operations cpu_dev_ops = {
 	.init = model_f3x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, 0x0f34 }, /* Xeon */
 	{ 0, 0 },
diff --git a/src/cpu/intel/model_f4x/model_f4x_init.c b/src/cpu/intel/model_f4x/model_f4x_init.c
index d6acddee09..e2ab022ebd 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/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -10,7 +9,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 static uint32_t microcode_updates[] = {
 	/* WARNING - Intel has a new data structure that has variable length
@@ -26,7 +24,6 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_f4x_init(device_t cpu)
 {
 	/* Turn on caching if we haven't already */
@@ -47,6 +44,7 @@ static void model_f4x_init(device_t cpu)
 static struct device_operations cpu_dev_ops = {
 	.init = model_f4x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, 0x0f41 }, /* Xeon */
 	{ 0, 0 },