Merge branch 'x86/urgent' into x86/cpu

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / cpucheck.c

diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
index 19b14f7ef9f1c3945845ca9423e00ba2ba5851d8..4d3ff037201ffbee0bb468e04d069b02909d094d 100644 (file)
--- a/arch/x86/boot/cpucheck.c
+++ b/arch/x86/boot/cpucheck.c
@@ -22,21 +22,13 @@
 
 #ifdef _SETUP
 # include "boot.h"
-# include "bitops.h"
 #endif
 #include <linux/types.h>
-#include <asm/cpufeature.h>
 #include <asm/processor-flags.h>
 #include <asm/required-features.h>
 #include <asm/msr-index.h>
 
-struct cpu_features {
-       int level;              /* Family, or 64 for x86-64 */
-       int model;
-       u32 flags[NCAPINTS];
-};
-
-static struct cpu_features cpu;
+struct cpu_features cpu;
 static u32 cpu_vendor[3];
 static u32 err_flags[NCAPINTS];