Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index db170ecab35756ebd6f2144eda8789a5baeebefd..f4e4c47fa847400f162fb3bdea8ad791cb74d9e0 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -48,6 +48,7 @@
 
 #include "vm_basic_types.h"
 #include "community_source.h"
+#include "x86vendor.h"
 
 /*
  * The linux kernel's ptrace.h stupidly defines the bare
@@ -162,20 +163,6 @@ typedef enum {
    CPUID_NUM_REGS
 } CpuidReg;
 
-/*
- * CPU vendors
- */
-
-typedef enum {
-   CPUID_VENDOR_UNKNOWN,
-   CPUID_VENDOR_COMMON,
-   CPUID_VENDOR_INTEL,
-   CPUID_VENDOR_AMD,
-   CPUID_VENDOR_CYRIX,
-   CPUID_VENDOR_VIA,
-   CPUID_NUM_VENDORS
-} CpuidVendor;
-
 #define CPUID_INTEL_VENDOR_STRING       "GenuntelineI"
 #define CPUID_AMD_VENDOR_STRING         "AuthcAMDenti"
 #define CPUID_CYRIX_VENDOR_STRING       "CyriteadxIns"