From: VMware, Inc <>
Date: Mon, 22 Mar 2010 22:13:19 +0000 (-0700)
Subject: Backout previous change.
X-Git-Tag: 2010.03.20-243334~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbc7bb81bbbe835ce66a3190875e2512edc4fb49;p=thirdparty%2Fopen-vm-tools.git

Backout previous change.

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 f4e4c47fa..db170ecab 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -48,7 +48,6 @@
 
 #include "vm_basic_types.h"
 #include "community_source.h"
-#include "x86vendor.h"
 
 /*
  * The linux kernel's ptrace.h stupidly defines the bare
@@ -163,6 +162,20 @@ 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"
diff --git a/open-vm-tools/lib/include/x86vendor.h b/open-vm-tools/lib/include/x86vendor.h
index ae6966a7a..e69de29bb 100644
--- a/open-vm-tools/lib/include/x86vendor.h
+++ b/open-vm-tools/lib/include/x86vendor.h
@@ -1,51 +0,0 @@
-
-/*********************************************************
- * Copyright (C) 1998-2008 VMware, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation version 2.1 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *********************************************************/
-
-/*********************************************************
- * The contents of this file are subject to the terms of the Common
- * Development and Distribution License (the "License") version 1.0
- * and no later version.  You may not use this file except in
- * compliance with the License.
- *
- * You can obtain a copy of the License at
- *         http://www.opensource.org/licenses/cddl1.php
- *
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- *********************************************************/
-
-#ifndef _X86VENDOR_H_
-#define _X86VENDOR_H_
-
-/*
- * 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;
-
-#endif