Remove some duplicate #include files (trivial).

[coreboot.git] / src / cpu / intel / model_69x / model_69x_init.c

diff --git a/src/cpu/intel/model_69x/model_69x_init.c b/src/cpu/intel/model_69x/model_69x_init.c
index 600ad464189c5c32db781c0017dcd4538fc9f53b..588ea69ab3e209cc07f9878f27445fbba6b0475b 100644 (file)
--- 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,13 +17,13 @@ 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 */
        x86_enable_cache();
+       x86_setup_mtrrs(36);
        x86_mtrr_check();
-       
+
        /* Update the microcode */
        intel_update_microcode(microcode_updates);
 
@@ -36,12 +34,14 @@ 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, 0x0695 }, /* Pentium M */
+       { X86_VENDOR_INTEL, 0x0690 }, /* Pentium M */
+       { X86_VENDOR_INTEL, 0x0695 },
        { 0, 0 },
 };
 
-static struct cpu_driver driver __cpu_driver = {
+static const struct cpu_driver driver __cpu_driver = {
        .ops      = &cpu_dev_ops,
        .id_table = cpu_table,
 };